third_party/WebKit/Source/platform/graphics/filters/FEComposite.cpp - Issue 1387573003: Pass SkiaImageFilterBuilder& to FilterEffect::createImageFilter

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 1387573003: Pass SkiaImageFilterBuilder& to FilterEffect::createImageFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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/FEComposite.h ('k') | third_party/WebKit/Source/platform/graphics/filters/FEConvolveMatrix.h » ('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 bb89b5c8cf1ad4d88d2b35f13f2b7889c2bad6ce..f5689e0a2a03dbf5d99c12ca25e1df4aea79c34e 100644

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

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

@@ -192,21 +192,21 @@ SkXfermode::Mode toXfermode(CompositeOperationType mode)

}

-PassRefPtr<SkImageFilter> FEComposite::createImageFilter(SkiaImageFilterBuilder* builder)

+PassRefPtr<SkImageFilter> FEComposite::createImageFilter(SkiaImageFilterBuilder& builder)

{

return createImageFilterInternal(builder, true);

}

-PassRefPtr<SkImageFilter> FEComposite::createImageFilterWithoutValidation(SkiaImageFilterBuilder* builder)

+PassRefPtr<SkImageFilter> FEComposite::createImageFilterWithoutValidation(SkiaImageFilterBuilder& builder)

{

return createImageFilterInternal(builder, false);

}

-PassRefPtr<SkImageFilter> FEComposite::createImageFilterInternal(SkiaImageFilterBuilder* builder, bool requiresPMColorValidation)

+PassRefPtr<SkImageFilter> FEComposite::createImageFilterInternal(SkiaImageFilterBuilder& builder, bool requiresPMColorValidation)

{

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

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

- SkImageFilter::CropRect cropRect = getCropRect(builder->cropOffset());

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

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

+ SkImageFilter::CropRect cropRect = getCropRect(builder.cropOffset());

RefPtr<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));