third_party/WebKit/Source/platform/graphics/GraphicsContext.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/GraphicsContext.cpp

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

Patch Set: Respond to reviews 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:

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

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

index b6535bbb72a563b31c4a8484e8f097c1f64cadba..2c37a52e04261ab2f7c76ac640bfbe4de60f8c40 100644

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

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

@@ -268,7 +268,7 @@ void GraphicsContext::beginLayer(float opacity, SkXfermode::Mode xfermode, const

SkPaint layerPaint;

layerPaint.setAlpha(static_cast<unsigned char>(opacity * 255));

layerPaint.setXfermodeMode(xfermode);

- layerPaint.setColorFilter(WebCoreColorFilterToSkiaColorFilter(colorFilter).get());

+ layerPaint.setColorFilter(toSkSp(WebCoreColorFilterToSkiaColorFilter(colorFilter)));

layerPaint.setImageFilter(imageFilter);

if (bounds) {

@@ -1258,7 +1258,7 @@ PassRefPtr<SkColorFilter> GraphicsContext::WebCoreColorFilterToSkiaColorFilter(C

{

switch (colorFilter) {

case ColorFilterLuminanceToAlpha:

- return adoptRef(SkLumaColorFilter::Create());

+ return fromSkSp(SkLumaColorFilter::Make());

case ColorFilterLinearRGBToSRGB:

return ColorSpaceUtilities::createColorSpaceFilter(ColorSpaceLinearRGB, ColorSpaceDeviceRGB);

case ColorFilterSRGBToLinearRGB: