third_party/WebKit/Source/core/layout/shapes/RasterShape.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/layout/shapes/RasterShape.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:

Index: third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp

diff --git a/third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp b/third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp

index 864925ed47e2b7620909ffccc0721a6d24f40eb6..3a7e445643e0ad159683169ee5495fee25924b11 100644

--- a/third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp

+++ b/third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp

@@ -77,8 +77,8 @@ RasterShapeIntervals::computeShapeMarginIntervals(int shapeMargin) const {

? size()

: size() - offset() * 2 + shapeMargin * 2;

std::unique_ptr<RasterShapeIntervals> result =

- wrapUnique(new RasterShapeIntervals(marginIntervalsSize,

- std::max(shapeMargin, offset())));

+ WTF::wrapUnique(new RasterShapeIntervals(

+ marginIntervalsSize, std::max(shapeMargin, offset())));

MarginIntervalGenerator marginIntervalGenerator(shapeMargin);

for (int y = bounds().y(); y < bounds().maxY(); ++y) {