src/codec/SkCodecImageGenerator.cpp - Issue 1862133002: Add whitelist parameter to refEncodedData

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: src/codec/SkCodecImageGenerator.cpp

Issue 1862133002: Add whitelist parameter to refEncodedData (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Make test pass regardless of CTX build flag Created 4 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:

Index: src/codec/SkCodecImageGenerator.cpp

diff --git a/src/codec/SkCodecImageGenerator.cpp b/src/codec/SkCodecImageGenerator.cpp

index db13aaea2973f62445477f8fefdf42bef948d761..8a7f441f374306040306481b021e480be3b0ce57 100644

--- a/src/codec/SkCodecImageGenerator.cpp

+++ b/src/codec/SkCodecImageGenerator.cpp

@@ -39,6 +39,15 @@ SkCodecImageGenerator::SkCodecImageGenerator(SkCodec* codec, SkData* data)

{}

SkData* SkCodecImageGenerator::onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) {

+#ifndef SK_SUPPORT_LEGACY_REFENCODEDDATA_NOCTX

+ if (query) {

+ if (!query->supportedFormat(fCodec->getEncodedFormat()) ||

+ !query->supportedFormatFromData(fData->data(), fData->size()))

+ {

+ return nullptr;

+ }

+#endif

return SkRef(fData.get());

}