Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp

Issue 2044093002: Blink image-decoders: (lazy) deferred image decoding support for ICO (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/image-decoders/ImageDecoderTestHelpers.h" 5 #include "platform/image-decoders/ImageDecoderTestHelpers.h"
6 6
7 #include "platform/SharedBuffer.h" 7 #include "platform/SharedBuffer.h"
8 #include "platform/image-decoders/ImageDecoder.h" 8 #include "platform/image-decoders/ImageDecoder.h"
9 #include "platform/image-decoders/ImageFrame.h" 9 #include "platform/image-decoders/ImageFrame.h"
10 #include "platform/testing/UnitTestHelpers.h" 10 #include "platform/testing/UnitTestHelpers.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 sourceData[1]->append(source++, 1u); 79 sourceData[1]->append(source++, 1u);
80 // Alternate the buffers to cover the JPEGImageDecoder::onSetData restar t code. 80 // Alternate the buffers to cover the JPEGImageDecoder::onSetData restar t code.
81 decoder->setData(sourceData[length & 1].get(), length == data->size()); 81 decoder->setData(sourceData[length & 1].get(), length == data->size());
82 82
83 EXPECT_LE(frameCount, decoder->frameCount()); 83 EXPECT_LE(frameCount, decoder->frameCount());
84 frameCount = decoder->frameCount(); 84 frameCount = decoder->frameCount();
85 85
86 if (!decoder->isSizeAvailable()) 86 if (!decoder->isSizeAvailable())
87 continue; 87 continue;
88 88
89 ImageFrame* frame = decoder->frameBufferAtIndex(frameCount - 1); 89 for (size_t i = framesDecoded; i < frameCount; ++i) {
90 if (frame && frame->getStatus() == ImageFrame::FrameComplete && framesDe coded < frameCount) 90 // In ICOImageDecoder memory layout could differ from frame order.
91 ++framesDecoded; 91 // E.g. memory layout could be |<frame1><frame0>| and frameCount
92 // would return 1 until receiving full file.
93 // When file is completely received frameCount would return 2 and
94 // only then both frames could be completely decoded.
95 ImageFrame* frame = decoder->frameBufferAtIndex(i);
96 if (frame && frame->getStatus() == ImageFrame::FrameComplete)
97 ++framesDecoded;
98 }
92 } 99 }
93 100
94 EXPECT_FALSE(decoder->failed()); 101 EXPECT_FALSE(decoder->failed());
95 EXPECT_EQ(expectedFrameCount, decoder->frameCount()); 102 EXPECT_EQ(expectedFrameCount, decoder->frameCount());
96 EXPECT_EQ(expectedFrameCount, framesDecoded); 103 EXPECT_EQ(expectedFrameCount, framesDecoded);
97 EXPECT_EQ(expectedRepetitionCount, decoder->repetitionCount()); 104 EXPECT_EQ(expectedRepetitionCount, decoder->repetitionCount());
98 105
99 ASSERT_EQ(expectedFrameCount, baselineHashes.size()); 106 ASSERT_EQ(expectedFrameCount, baselineHashes.size());
100 for (size_t i = 0; i < decoder->frameCount(); i++) { 107 for (size_t i = 0; i < decoder->frameCount(); i++) {
101 ImageFrame* frame = decoder->frameBufferAtIndex(i); 108 ImageFrame* frame = decoder->frameBufferAtIndex(i);
(...skipping 30 matching lines...) Expand all
132 // data in a segment, its pointer would no longer be valid. 139 // data in a segment, its pointer would no longer be valid.
133 segmentedData->data(); 140 segmentedData->data();
134 141
135 ImageFrame* frame = decoder->frameBufferAtIndex(0); 142 ImageFrame* frame = decoder->frameBufferAtIndex(0);
136 ASSERT_FALSE(decoder->failed()); 143 ASSERT_FALSE(decoder->failed());
137 EXPECT_EQ(frame->getStatus(), ImageFrame::FrameComplete); 144 EXPECT_EQ(frame->getStatus(), ImageFrame::FrameComplete);
138 EXPECT_EQ(hashBitmap(frame->bitmap()), hash); 145 EXPECT_EQ(hashBitmap(frame->bitmap()), hash);
139 } 146 }
140 147
141 } // namespace blink 148 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698