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: Moving xform back to image generator 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

« third_party/WebKit/Source/platform/graphics/ImageDecodingStore.h ('K') | « 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 5682367514db1b8ec12669bb9a63b787f584448c..af8a8feee46d7337077f658c01ffc86ee76ff0c0 100644

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

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

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

EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes());

ImageDecoder* testDecoder;

- EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(),

- size, &testDecoder));

+ EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(

+ m_generator.get(), size, ImageDecoder::AlphaPremultiplied, &testDecoder));

EXPECT_TRUE(testDecoder);

EXPECT_EQ(refDecoder, testDecoder);

ImageDecodingStore::instance().unlockDecoder(m_generator.get(), testDecoder);

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

ImageDecoder* testDecoder;

EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(

- m_generator.get(), SkISize::Make(2, 2), &testDecoder));

+ m_generator.get(), SkISize::Make(2, 2), ImageDecoder::AlphaPremultiplied,

+ &testDecoder));

evictOneCache();

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

EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes());

ImageDecoder* testDecoder;

- EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(),

- size, &testDecoder));

+ EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(

+ m_generator.get(), size, ImageDecoder::AlphaPremultiplied, &testDecoder));

EXPECT_TRUE(testDecoder);

EXPECT_EQ(refDecoder, testDecoder);

ImageDecodingStore::instance().removeDecoder(m_generator.get(), testDecoder);

EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries());

- EXPECT_FALSE(ImageDecodingStore::instance().lockDecoder(m_generator.get(),

- size, &testDecoder));

+ EXPECT_FALSE(ImageDecodingStore::instance().lockDecoder(

+ m_generator.get(), size, ImageDecoder::AlphaPremultiplied, &testDecoder));

}

} // namespace blink