third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp - Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/

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/css/BasicShapeFunctions.cpp

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8

Patch Set: get-names-9: rebase Created 4 years, 10 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/build/scripts/templates/StyleBuilder.cpp.tmpl ('k') | third_party/WebKit/Source/core/css/CSSProperties.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp

diff --git a/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp b/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp

index 31d495c2dbd79207dfcc64dd2bf12180acf3ca69..143d9ba62da54b8cefd036ccf78def7534caaef1 100644

--- a/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp

+++ b/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp

@@ -41,7 +41,7 @@ namespace blink {

static PassRefPtrWillBeRawPtr<CSSValue> valueForCenterCoordinate(CSSValuePool& pool, const ComputedStyle& style, const BasicShapeCenterCoordinate& center, EBoxOrient orientation)

{

- if (center.direction() == BasicShapeCenterCoordinate::TopLeft)

+ if (center.getDirection() == BasicShapeCenterCoordinate::TopLeft)

return pool.createValue(center.length(), style);

CSSValueID keyword = orientation == HORIZONTAL ? CSSValueRight : CSSValueBottom;

@@ -91,7 +91,7 @@ PassRefPtrWillBeRawPtr<CSSValue> valueForBasicShape(const ComputedStyle& style,

const BasicShapePolygon* polygon = toBasicShapePolygon(basicShape);

RefPtrWillBeRawPtr<CSSBasicShapePolygonValue> polygonValue = CSSBasicShapePolygonValue::create();

- polygonValue->setWindRule(polygon->windRule());

+ polygonValue->setWindRule(polygon->getWindRule());

const Vector<Length>& values = polygon->values();

for (unsigned i = 0; i < values.size(); i += 2)

polygonValue->appendPoint(pool.createValue(values.at(i), style), pool.createValue(values.at(i + 1), style));