src/effects/SkPerlinNoiseShader.cpp - Issue 973593002: change colorfilter to return an array of frag processors

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/effects/SkPerlinNoiseShader.cpp

Issue 973593002: change colorfilter to return an array of frag processors (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: update gm Created 5 years, 10 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/effects/SkPerlinNoiseShader.cpp

diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp

index b721296afe2d6c38cc75ea7cc5fdc99eded5a184..6e53253f292a5d55fb5911e3142ffd411c23a2be 100644

--- a/src/effects/SkPerlinNoiseShader.cpp

+++ b/src/effects/SkPerlinNoiseShader.cpp

@@ -967,7 +967,11 @@ bool SkPerlinNoiseShader::asFragmentProcessor(GrContext* context, const SkPaint&

}

SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(

clearColor, SkXfermode::kSrc_Mode));

- *fp = cf->asFragmentProcessor(context);

+ SkTDArray<GrFragmentProcessor*> array;

+ if (cf->asFragmentProcessors(context, &array)) {

+ SkASSERT(1 == array.count()); // modecolorfilter only returns one

+ *fp = array[0]; // transfer ownership to fp

+ }

return true;

}