third_party/WebKit/Source/platform/graphics/filters/FEComposite.cpp - Issue 1849213002: Remove SK_SUPPORT_LEGACY_XFERMODE_PTR

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/filters/FEComposite.cpp

Issue 1849213002: Remove SK_SUPPORT_LEGACY_XFERMODE_PTR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move or inline per review 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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/filters/FEBlend.cpp ('k') | third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/filters/FEComposite.cpp

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

index 035ee87b738f578d4d97c71be9149af0c21a2777..1dbe3a68d4856a4477e542bbc603a4282bcd8ccc 100644

--- a/third_party/WebKit/Source/platform/graphics/filters/FEComposite.cpp

+++ b/third_party/WebKit/Source/platform/graphics/filters/FEComposite.cpp

@@ -28,6 +28,7 @@

#include "SkXfermodeImageFilter.h"

#include "platform/graphics/filters/SkiaImageFilterBuilder.h"

+#include "platform/graphics/skia/SkiaUtils.h"

#include "platform/text/TextStream.h"

namespace blink {

@@ -205,12 +206,12 @@ PassRefPtr<SkImageFilter> FEComposite::createImageFilterInternal(SkiaImageFilter

RefPtr<SkImageFilter> foreground(builder.build(inputEffect(0), operatingColorSpace(), !mayProduceInvalidPreMultipliedPixels()));

RefPtr<SkImageFilter> background(builder.build(inputEffect(1), operatingColorSpace(), !mayProduceInvalidPreMultipliedPixels()));

SkImageFilter::CropRect cropRect = getCropRect();

- RefPtr<SkXfermode> mode;

+ sk_sp<SkXfermode> mode;

if (m_type == FECOMPOSITE_OPERATOR_ARITHMETIC)

- mode = adoptRef(SkArithmeticMode::Create(SkFloatToScalar(m_k1), SkFloatToScalar(m_k2), SkFloatToScalar(m_k3), SkFloatToScalar(m_k4), requiresPMColorValidation));

+ mode = SkArithmeticMode::Make(SkFloatToScalar(m_k1), SkFloatToScalar(m_k2), SkFloatToScalar(m_k3), SkFloatToScalar(m_k4), requiresPMColorValidation);

else

- mode = adoptRef(SkXfermode::Create(toXfermode(m_type)));

- return adoptRef(SkXfermodeImageFilter::Create(mode.get(), background.get(), foreground.get(), &cropRect));

+ mode = SkXfermode::Make(toXfermode(m_type));

+ return fromSkSp(SkXfermodeImageFilter::Make(std::move(mode), background.get(), foreground.get(), &cropRect));

}

static TextStream& operator<<(TextStream& ts, const CompositeOperationType& type)