third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp - Issue 1829093002: Use sk_sp-based APIs for SkColorFilter

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

Issue 1829093002: Use sk_sp-based APIs for SkColorFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Bad rebase Created 4 years, 9 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

« cc/trees/layer_tree_host_pixeltest_filters.cc ('K') | « third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp ('k') | third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp » ('j') | third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp

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

index 4db36e0669fb1abb4f15f38d44a536775735ece4..9ef1418d037ee6a4698e50e5df06c69d1968cdbd 100644

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

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

@@ -158,8 +158,8 @@ void GraphicsContextState::setLineDash(const DashArray& dashes, float dashOffset

void GraphicsContextState::setColorFilter(PassRefPtr<SkColorFilter> colorFilter)

{

m_colorFilter = colorFilter;

- m_strokePaint.setColorFilter(m_colorFilter.get());

- m_fillPaint.setColorFilter(m_colorFilter.get());

+ m_strokePaint.setColorFilter(toSkSp(m_colorFilter));

+ m_fillPaint.setColorFilter(toSkSp(m_colorFilter));

f(malita) 2016/03/26 14:16:49 Can we switch m_colorFilter & m_colorFilter to sk_

tomhudson 2016/03/28 13:11:17 There's only one SkColorFilter? Typo?

f(malita) 2016/03/28 13:39:32 Yeah, I was staring at m_strokePaint and m_fillPai

}

void GraphicsContextState::setInterpolationQuality(InterpolationQuality quality)