third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp - Issue 2716203002: blink: Fix cc/paint skia type mismatches

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/modules/canvas2d/CanvasRenderingContext2DState.cpp

Issue 2716203002: blink: Fix cc/paint skia type mismatches (Closed)

Patch Set: Fix canvas Created 3 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:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/paint/FilterEffectBuilder.h ('K') | « third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp ('k') | third_party/WebKit/Source/platform/fonts/Font.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

index fafdea7a4a84eeb1430ede6d12dc0e3202c61e0c..bdcbde4d350daf2cb548efac3cf42c4f52613bff 100644

--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

@@ -287,10 +287,10 @@ sk_sp<SkImageFilter> CanvasRenderingContext2DState::getFilterForOffscreenCanvas(

// We can't reuse m_fillFlags and m_strokeFlags for the filter, since these

// incorporate the global alpha, which isn't applicable here.

- SkPaint fillFlagsForFilter;

+ PaintFlags fillFlagsForFilter;

m_fillStyle->applyToFlags(fillFlagsForFilter);

fillFlagsForFilter.setColor(m_fillStyle->paintColor());

- SkPaint strokeFlagsForFilter;

+ PaintFlags strokeFlagsForFilter;

m_strokeStyle->applyToFlags(strokeFlagsForFilter);

strokeFlagsForFilter.setColor(m_strokeStyle->paintColor());