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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp

Issue 2454123002: Refactor image decoders to use 'colorSpace' instead of 'colorProfile' (Closed)
Patch Set: Fix legacy ImageFrame Created 4 years, 1 month 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/graphics/DeferredImageDecoder.h" 5 #include "platform/graphics/DeferredImageDecoder.h"
6 6
7 #include "platform/SharedBuffer.h" 7 #include "platform/SharedBuffer.h"
8 #include "platform/image-decoders/ImageDecoderTestHelpers.h" 8 #include "platform/image-decoders/ImageDecoderTestHelpers.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "third_party/skia/include/core/SkImage.h" 10 #include "third_party/skia/include/core/SkImage.h"
(...skipping 22 matching lines...) Expand all
33 static void mixImages(const char* fileName, 33 static void mixImages(const char* fileName,
34 size_t bytesForFirstFrame, 34 size_t bytesForFirstFrame,
35 size_t laterFrame) { 35 size_t laterFrame) {
36 RefPtr<SharedBuffer> file = readFile(fileName); 36 RefPtr<SharedBuffer> file = readFile(fileName);
37 ASSERT_NE(file, nullptr); 37 ASSERT_NE(file, nullptr);
38 38
39 RefPtr<SharedBuffer> partialFile = 39 RefPtr<SharedBuffer> partialFile =
40 SharedBuffer::create(file->data(), bytesForFirstFrame); 40 SharedBuffer::create(file->data(), bytesForFirstFrame);
41 std::unique_ptr<DeferredImageDecoder> decoder = DeferredImageDecoder::create( 41 std::unique_ptr<DeferredImageDecoder> decoder = DeferredImageDecoder::create(
42 partialFile, false, ImageDecoder::AlphaPremultiplied, 42 partialFile, false, ImageDecoder::AlphaPremultiplied,
43 ImageDecoder::GammaAndColorProfileIgnored); 43 ImageDecoder::ColorSpaceIgnored);
44 ASSERT_NE(decoder, nullptr); 44 ASSERT_NE(decoder, nullptr);
45 sk_sp<SkImage> partialImage = decoder->createFrameAtIndex(0); 45 sk_sp<SkImage> partialImage = decoder->createFrameAtIndex(0);
46 46
47 RefPtr<SharedBuffer> almostCompleteFile = 47 RefPtr<SharedBuffer> almostCompleteFile =
48 SharedBuffer::create(file->data(), file->size() - 1); 48 SharedBuffer::create(file->data(), file->size() - 1);
49 decoder->setData(almostCompleteFile, false); 49 decoder->setData(almostCompleteFile, false);
50 sk_sp<SkImage> imageWithMoreData = decoder->createFrameAtIndex(laterFrame); 50 sk_sp<SkImage> imageWithMoreData = decoder->createFrameAtIndex(laterFrame);
51 51
52 imageWithMoreData->preroll(); 52 imageWithMoreData->preroll();
53 partialImage->preroll(); 53 partialImage->preroll();
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // We need contiguous data, which SharedBuffer doesn't guarantee. 94 // We need contiguous data, which SharedBuffer doesn't guarantee.
95 sk_sp<SkData> skData = fileBuffer->getAsSkData(); 95 sk_sp<SkData> skData = fileBuffer->getAsSkData();
96 EXPECT_EQ(skData->size(), fileBuffer->size()); 96 EXPECT_EQ(skData->size(), fileBuffer->size());
97 const char* data = reinterpret_cast<const char*>(skData->bytes()); 97 const char* data = reinterpret_cast<const char*>(skData->bytes());
98 98
99 // Truncated signature (only 1 byte). Decoder instantiation should fail. 99 // Truncated signature (only 1 byte). Decoder instantiation should fail.
100 RefPtr<SharedBuffer> buffer = SharedBuffer::create<size_t>(data, 1u); 100 RefPtr<SharedBuffer> buffer = SharedBuffer::create<size_t>(data, 1u);
101 EXPECT_FALSE(ImageDecoder::hasSufficientDataToSniffImageType(*buffer)); 101 EXPECT_FALSE(ImageDecoder::hasSufficientDataToSniffImageType(*buffer));
102 EXPECT_EQ(nullptr, DeferredImageDecoder::create( 102 EXPECT_EQ(nullptr, DeferredImageDecoder::create(
103 buffer, false, ImageDecoder::AlphaPremultiplied, 103 buffer, false, ImageDecoder::AlphaPremultiplied,
104 ImageDecoder::GammaAndColorProfileIgnored)); 104 ImageDecoder::ColorSpaceIgnored));
105 105
106 // Append the rest of the data. We should be able to sniff the signature 106 // Append the rest of the data. We should be able to sniff the signature
107 // now, even if segmented. 107 // now, even if segmented.
108 buffer->append<size_t>(data + 1, skData->size() - 1); 108 buffer->append<size_t>(data + 1, skData->size() - 1);
109 EXPECT_TRUE(ImageDecoder::hasSufficientDataToSniffImageType(*buffer)); 109 EXPECT_TRUE(ImageDecoder::hasSufficientDataToSniffImageType(*buffer));
110 std::unique_ptr<DeferredImageDecoder> decoder = 110 std::unique_ptr<DeferredImageDecoder> decoder =
111 DeferredImageDecoder::create(buffer, false, 111 DeferredImageDecoder::create(buffer, false,
112 ImageDecoder::AlphaPremultiplied, 112 ImageDecoder::AlphaPremultiplied,
113 ImageDecoder::GammaAndColorProfileIgnored); 113 ImageDecoder::ColorSpaceIgnored);
114 ASSERT_NE(decoder, nullptr); 114 ASSERT_NE(decoder, nullptr);
115 EXPECT_TRUE(String(testFiles[i]).endsWith(decoder->filenameExtension())); 115 EXPECT_TRUE(String(testFiles[i]).endsWith(decoder->filenameExtension()));
116 } 116 }
117 } 117 }
118 118
119 } // namespace blink 119 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698