Index: third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp |
diff --git a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp |
index 95bb9acdc865b99a90f721ad01681aa1a9f36196..5f188ba86667c4050c69c9d7d1fbb9491a0063fa 100644 |
--- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp |
+++ b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp |
@@ -974,14 +974,6 @@ void JPEGImageDecoder::complete() |
m_frameBufferCache[0].setStatus(ImageFrame::FrameComplete); |
} |
-inline bool isComplete(const JPEGImageDecoder* decoder, bool onlySize) |
-{ |
- if (decoder->hasImagePlanes() && !onlySize) |
- return true; |
- |
- return decoder->frameIsCompleteAtIndex(0); |
-} |
- |
void JPEGImageDecoder::decode(bool onlySize) |
{ |
if (failed()) |
@@ -998,7 +990,7 @@ void JPEGImageDecoder::decode(bool onlySize) |
setFailed(); |
// If decoding is done or failed, we don't need the JPEGImageReader anymore. |
- if (isComplete(this, onlySize) || failed()) |
+ if (frameIsCompleteAtIndex(0) || (hasImagePlanes() && !onlySize) || failed()) |
m_reader.reset(); |
} |