Change an existing check to ASSERT

third_party/WebKit/Source/core/frame/ImageBitmap.cpp

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/ImageBitmap.h"
 
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "platform/image-decoders/ImageDecoder.h"
@@ skipping 25 matching lines @@
 static inline IntRect normalizeRect(const IntRect& rect)
 {
     return IntRect(std::min(rect.x(), rect.maxX()),
         std::min(rect.y(), rect.maxY()),
         std::max(rect.width(), -rect.width()),
         std::max(rect.height(), -rect.height()));
 }
 
 static bool frameIsValid(const SkBitmap& frameBitmap)
 {
-    ASSERT(!frameBitmap.isNull() && !frameBitmap.empty());
-    return frameBitmap.isImmutable()
-        && frameBitmap.colorType() == kN32_SkColorType;
+    ASSERT(!frameBitmap.isNull() && !frameBitmap.empty() && frameBitmap.isImmutable());
+    return frameBitmap.colorType() == kN32_SkColorType;
 }
 
 static SkImage* flipSkImageVertically(SkImage* input)
 {
     int width = input->width();
     int height = input->height();
     SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
     OwnPtr<uint8_t[]> imagePixels = adoptArrayPtr(new uint8_t[width * height * info.bytesPerPixel()]);
     int imageRowBytes = info.bytesPerPixel() * width;
     input->readPixels(info, imagePixels.get(), imageRowBytes, 0, 0);
@@ skipping 38 matching lines @@
             return nullptr;
         decoder->setData(image->data(), true);
         if (!decoder->frameCount())
             return nullptr;
         ImageFrame* frame = decoder->frameBufferAtIndex(0);
         if (!frame || frame->status() != ImageFrame::FrameComplete)
             return nullptr;
         SkBitmap bitmap = frame->bitmap();
         if (!frameIsValid(bitmap))
             return nullptr;
-        ASSERT(bitmap.isImmutable());
         skiaImage = adoptRef(SkImage::NewFromBitmap(bitmap));
     }
 
     if (cropRect == srcRect) {
         if (flipYEnabled)
             return StaticBitmapImage::create(adoptRef(flipSkImageVertically(skiaImage->newSubset(srcRect))));
         return StaticBitmapImage::create(adoptRef(skiaImage->newSubset(srcRect)));
     }
 
     RefPtr<SkSurface> surface = adoptRef(SkSurface::NewRasterN32Premul(cropRect.width(), cropRect.height()));
@@ skipping 238 matching lines @@
 {
     return FloatSize(width(), height());
 }
 
 DEFINE_TRACE(ImageBitmap)
 {
     ImageLoaderClient::trace(visitor);
 }
 
 } // namespace blink