samplecode/SampleAll.cpp - Issue 1574023002: move declaration of CreateLightingFilter into SkColorMatrixFilter

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: samplecode/SampleAll.cpp

Issue 1574023002: move declaration of CreateLightingFilter into SkColorMatrixFilter (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: don't remove old impl yet Created 4 years, 11 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

Index: samplecode/SampleAll.cpp

diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp

index 21d93bd8ae5e47276239739976f2534d443afb78..ad3181f7cd57ccc064efd4dfdf3de884fe661692 100644

--- a/samplecode/SampleAll.cpp

+++ b/samplecode/SampleAll.cpp

@@ -12,7 +12,7 @@

#include "Sk1DPathEffect.h"

#include "Sk2DPathEffect.h"

#include "SkBlurMaskFilter.h"

-#include "SkColorFilter.h"

+#include "SkColorMatrixFilter.h"

#include "SkColorPriv.h"

#include "SkCornerPathEffect.h"

#include "SkDashPathEffect.h"

@@ -385,7 +385,7 @@ protected:

SkMaskFilter* embossFilter = SkEmbossMaskFilter::Create(sigma, light);

SkXfermode* xfermode = SkXfermode::Create(SkXfermode::kXor_Mode);

- SkColorFilter* lightingFilter = SkColorFilter::CreateLightingFilter(

+ SkColorFilter* lightingFilter = SkColorMatrixFilter::CreateLightingFilter(

0xff89bc45, 0xff112233);

canvas->save();

@@ -551,7 +551,7 @@ protected:

#if 01

int index = i % SK_ARRAY_COUNT(gLightingColors);

- paint.setColorFilter(SkColorFilter::CreateLightingFilter(

+ paint.setColorFilter(SkColorMatrixFilter::CreateLightingFilter(

gLightingColors[index].fMul,

gLightingColors[index].fAdd))->unref();

#endif

« no previous file with comments | « include/effects/SkColorMatrixFilter.h ('k') | samplecode/SampleFilterFuzz.cpp » ('j') | no next file with comments »