Chromium Code Reviews| Index: third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp |
| diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp |
| index d21f7e7cb3037ff10c86b7122f895a44f9418d90..fe95083eee14c51229c5fe0b79eefd595773c63d 100644 |
| --- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp |
| +++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp |
| @@ -129,7 +129,7 @@ size_t ImageDecoder::frameCount() |
| return newSize; |
| } |
| -ImageFrame* ImageDecoder::frameBufferAtIndex(size_t index) |
| +ImageFrame* ImageDecoder::frameBufferAtIndex(size_t index, ImageFrame::ColorType outputColor) |
| { |
| if (index >= frameCount()) |
| return 0; |
| @@ -137,7 +137,7 @@ ImageFrame* ImageDecoder::frameBufferAtIndex(size_t index) |
| ImageFrame* frame = &m_frameBufferCache[index]; |
| if (frame->status() != ImageFrame::FrameComplete) { |
|
scroggo_chromium
2015/12/03 21:47:21
It appears that if the frame was complete, it look
aleksandar.stojiljkovic
2015/12/04 00:07:34
Yes, RELEASE_ASSERT there needed.
|
| PlatformInstrumentation::willDecodeImage(filenameExtension()); |
| - decode(index); |
| + decodeTo(index, outputColor); |
| PlatformInstrumentation::didDecodeImage(); |
| } |