Index: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp |
diff --git a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp |
index 75944c4ad4d4f5af0d5bdfc993cac68eff0e7ec7..3eab0b816337cf97b86b1c7546e74878a1697bac 100644 |
--- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp |
+++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp |
@@ -218,12 +218,14 @@ bool ICOImageDecoder::decodeAtIndex(size_t index) { |
} |
// Fail if the size the PNGImageDecoder calculated does not match the size |
// in the directory. |
- if (m_pngDecoders[index]->isSizeAvailable() && |
- (m_pngDecoders[index]->size() != dirEntry.m_size)) |
+ auto& pngDecoder = m_pngDecoders[index]; |
Peter Kasting
2017/03/17 21:37:05
I would prefer "auto* pngDecoder = m_pngDecoders[i
scroggo_chromium
2017/03/20 13:26:42
Done.
|
+ if (pngDecoder->isSizeAvailable() && pngDecoder->size() != dirEntry.m_size) |
Peter Kasting
2017/03/17 21:37:05
If isSizeAvailable() is false, should we really fa
scroggo_chromium
2017/03/20 13:26:42
We only fail here if the size is available and it
Peter Kasting
2017/03/20 20:42:15
Hmm:
(a) I misread the new code, and
(b) I think t
scroggo_chromium
2017/03/21 16:03:30
Sgtm. I'd prefer to make this a separate change.
scroggo_chromium
2017/03/21 16:16:52
Uploaded https://codereview.chromium.org/276130300
|
return setFailed(); |
- m_frameBufferCache[index] = *m_pngDecoders[index]->frameBufferAtIndex(0); |
- m_frameBufferCache[index].setPremultiplyAlpha(m_premultiplyAlpha); |
- return !m_pngDecoders[index]->failed() || setFailed(); |
+ if (const auto* frame = pngDecoder->frameBufferAtIndex(0)) { |
+ m_frameBufferCache[index] = *frame; |
+ m_frameBufferCache[index].setPremultiplyAlpha(m_premultiplyAlpha); |
scroggo_chromium
2017/03/17 17:50:34
I don't see how this line is necessary. AFAICT, th
Peter Kasting
2017/03/17 21:37:05
I would just remove it now. I think this is an ar
scroggo_chromium
2017/03/20 13:26:42
Done.
|
+ } |
+ return !pngDecoder->failed() || setFailed(); |
} |
bool ICOImageDecoder::processDirectory() { |