third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp - Issue 2787053004: Respect colorSpace in DecodingImageGenerator::onGetPixels()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp

Issue 2787053004: Respect colorSpace in DecodingImageGenerator::onGetPixels() (Closed)

Patch Set: Rebase Created 3 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp ('k') | third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp b/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp

index deb3d0562634b27aeca0bcd0cd57b72ea15a3171..a56f0cfac03b31ad160e8e2f99a3dbe427504fda 100644

--- a/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp

+++ b/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp

@@ -83,8 +83,9 @@ TEST_F(ImageDecodingStoreTest, insertDecoder) {

EXPECT_EQ(4u, ImageDecodingStore::Instance().MemoryUsageInBytes());

ImageDecoder* test_decoder;

- EXPECT_TRUE(ImageDecodingStore::Instance().LockDecoder(generator_.Get(), size,

- &test_decoder));

+ EXPECT_TRUE(ImageDecodingStore::Instance().LockDecoder(

+ generator_.Get(), size, ImageDecoder::kAlphaPremultiplied,

+ &test_decoder));

EXPECT_TRUE(test_decoder);

EXPECT_EQ(ref_decoder, test_decoder);

ImageDecodingStore::Instance().UnlockDecoder(generator_.Get(), test_decoder);

@@ -137,7 +138,8 @@ TEST_F(ImageDecodingStoreTest, decoderInUseNotEvicted) {

ImageDecoder* test_decoder;

EXPECT_TRUE(ImageDecodingStore::Instance().LockDecoder(

- generator_.Get(), SkISize::Make(2, 2), &test_decoder));

+ generator_.Get(), SkISize::Make(2, 2), ImageDecoder::kAlphaPremultiplied,

+ &test_decoder));

EvictOneCache();

@@ -162,15 +164,17 @@ TEST_F(ImageDecodingStoreTest, removeDecoder) {

EXPECT_EQ(4u, ImageDecodingStore::Instance().MemoryUsageInBytes());

ImageDecoder* test_decoder;

- EXPECT_TRUE(ImageDecodingStore::Instance().LockDecoder(generator_.Get(), size,

- &test_decoder));

+ EXPECT_TRUE(ImageDecodingStore::Instance().LockDecoder(

+ generator_.Get(), size, ImageDecoder::kAlphaPremultiplied,

+ &test_decoder));

EXPECT_TRUE(test_decoder);

EXPECT_EQ(ref_decoder, test_decoder);

ImageDecodingStore::Instance().RemoveDecoder(generator_.Get(), test_decoder);

EXPECT_FALSE(ImageDecodingStore::Instance().CacheEntries());

- EXPECT_FALSE(ImageDecodingStore::Instance().LockDecoder(generator_.Get(),

- size, &test_decoder));

+ EXPECT_FALSE(ImageDecodingStore::Instance().LockDecoder(

+ generator_.Get(), size, ImageDecoder::kAlphaPremultiplied,

+ &test_decoder));

}

} // namespace blink