third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp - Issue 1460523002: GIF decoding to Index8, unit tests and misusing unit test as benchmark

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/DeferredImageDecoder.cpp

Issue 1460523002: GIF decoding to Index8, unit tests and misusing unit test as benchmark (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Skia:onGetColorType related implementation. Fix part of Leon's review comments. Created 5 years 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/DecodingImageGenerator.h ('K') | « third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.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/DeferredImageDecoder.cpp

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

index a9621b5a1058f9cd5e2404cb48dfd82615ab593d..f6a882bef2a4a717aa428764f5215d73da629411 100644

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

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

@@ -213,6 +213,8 @@ void DeferredImageDecoder::activateLazyDecoding()

m_hasColorProfile = m_actualDecoder->hasColorProfile();

const bool isSingleFrame = m_actualDecoder->repetitionCount() == cAnimationNone || (m_allDataReceived && m_actualDecoder->frameCount() == 1u);

m_frameGenerator = ImageFrameGenerator::create(SkISize::Make(m_actualDecoder->decodedSize().width(), m_actualDecoder->decodedSize().height()), m_data, m_allDataReceived, !isSingleFrame);

+ // GIF images support Index8 decoding: other decoders do not.

+ m_frameGenerator->setDecoderCanDecodeToIndex8(m_filenameExtension == "gif");

}

void DeferredImageDecoder::prepareLazyDecodedFrames()

@@ -260,8 +262,11 @@ PassRefPtr<SkImage> DeferredImageDecoder::createImage(size_t index, bool knownTo

ASSERT(decodedSize.width() > 0);

ASSERT(decodedSize.height() > 0);

- const SkImageInfo info = SkImageInfo::MakeN32(decodedSize.width(), decodedSize.height(),

- knownToBeOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);

+ const SkImageInfo info = m_frameGenerator->canDecodeTo(index, kIndex_8_SkColorType)

+ ? SkImageInfo::Make(decodedSize.width(), decodedSize.height(), kIndex_8_SkColorType,

+ knownToBeOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType)

+ : SkImageInfo::MakeN32(decodedSize.width(), decodedSize.height(),

+ knownToBeOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);

DecodingImageGenerator* generator = new DecodingImageGenerator(m_frameGenerator, info, index);

RefPtr<SkImage> image = adoptRef(SkImage::NewFromGenerator(generator));