Index: third_party/WebKit/Source/platform/exported/WebImage.cpp |
diff --git a/third_party/WebKit/Source/platform/exported/WebImage.cpp b/third_party/WebKit/Source/platform/exported/WebImage.cpp |
index d4b14e300c3491b823cb21bf9e03749feae2f3f4..f7b8ef4a3615d34b017653564ccc114040e672fa 100644 |
--- a/third_party/WebKit/Source/platform/exported/WebImage.cpp |
+++ b/third_party/WebKit/Source/platform/exported/WebImage.cpp |
@@ -78,7 +78,7 @@ WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize) |
} |
ImageFrame* frame = decoder->frameBufferAtIndex(index); |
- if (!frame) |
+ if (!frame || decoder->failed()) |
return WebImage(); |
return WebImage(frame->bitmap()); |
Peter Kasting
2016/09/22 21:44:08
Nit: Shorter:
return (frame && !decoder->failed
aleksandar.stojiljkovic
2016/09/27 18:08:28
Done.
|
@@ -114,9 +114,10 @@ WebVector<WebImage> WebImage::framesFromData(const WebData& data) |
if (!frame) |
continue; |
- const SkBitmap& bitmap = frame->bitmap(); |
- if (!bitmap.isNull() && bitmap.isImmutable()) |
+ SkBitmap bitmap = frame->bitmap(); |
+ if (!bitmap.isNull() && frame->getStatus() == ImageFrame::FrameComplete) { |
Peter Kasting
2016/09/22 21:44:08
Nit: No {}
aleksandar.stojiljkovic
2016/09/27 18:08:28
Done.
|
frames.append(WebImage(bitmap)); |
+ } |
} |
return frames; |