third_party/WebKit/Source/core/paint/SVGPaintContext.cpp - Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed.

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/core/paint/SVGPaintContext.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)

Patch Set: Rebasing... Created 4 years 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/core/paint/SVGFilterPainter.cpp ('k') | third_party/WebKit/Source/core/paint/VideoPainterTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/SVGPaintContext.cpp

diff --git a/third_party/WebKit/Source/core/paint/SVGPaintContext.cpp b/third_party/WebKit/Source/core/paint/SVGPaintContext.cpp

index 31b325d375111353b7d91b8d953a34e12a1afa93..eab8db4016e64c7acf95bde7fe8ce018da59d96b 100644

--- a/third_party/WebKit/Source/core/paint/SVGPaintContext.cpp

+++ b/third_party/WebKit/Source/core/paint/SVGPaintContext.cpp

@@ -101,7 +101,7 @@ bool SVGPaintContext::applyClipMaskAndFilterIfNecessary() {

if (!isIsolationInstalled() &&

SVGLayoutSupport::isIsolationRequired(&m_object)) {

- m_compositingRecorder = wrapUnique(new CompositingRecorder(

+ m_compositingRecorder = WTF::wrapUnique(new CompositingRecorder(

paintInfo().context, m_object, SkBlendMode::kSrcOver, 1));

}

@@ -119,7 +119,7 @@ void SVGPaintContext::applyCompositingIfNecessary() {

if (opacity < 1 || blendMode != WebBlendModeNormal) {

const FloatRect compositingBounds =

m_object.visualRectInLocalSVGCoordinates();

- m_compositingRecorder = wrapUnique(new CompositingRecorder(

+ m_compositingRecorder = WTF::wrapUnique(new CompositingRecorder(

paintInfo().context, m_object,

WebCoreCompositeToSkiaComposite(CompositeSourceOver, blendMode),

opacity, &compositingBounds));

@@ -161,7 +161,7 @@ bool SVGPaintContext::applyFilterIfNecessary(SVGResources* resources) {

if (!filter)

return true;

m_filterRecordingContext =

- wrapUnique(new SVGFilterRecordingContext(paintInfo().context));

+ WTF::wrapUnique(new SVGFilterRecordingContext(paintInfo().context));

m_filter = filter;

GraphicsContext* filterContext = SVGFilterPainter(*filter).prepareEffect(

m_object, *m_filterRecordingContext);

@@ -170,7 +170,8 @@ bool SVGPaintContext::applyFilterIfNecessary(SVGResources* resources) {

// Because the filter needs to cache its contents we replace the context

// during filtering with the filter's context.

- m_filterPaintInfo = wrapUnique(new PaintInfo(*filterContext, m_paintInfo));

+ m_filterPaintInfo =

+ WTF::wrapUnique(new PaintInfo(*filterContext, m_paintInfo));

// Because we cache the filter contents and do not invalidate on paint

// invalidation rect changes, we need to paint the entire filter region