third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp - Issue 1746283002: Rename enums/functions that collide in chromium style in platform/

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/CSSPrimitiveValue.cpp

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-13-platform: . 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/core/animation/animatable/AnimatableValueTestHelper.cpp ('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/CSSPrimitiveValue.cpp

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

index 3c6eaf0a816453f78474467cbde0a3db5eb85759..325d1d412c9edd713fa40a05e9940d65cb24826c 100644

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

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

@@ -258,11 +258,11 @@ CSSPrimitiveValue::CSSPrimitiveValue(const Length& length, float zoom)

m_value.num = length.value() / zoom;

break;

case Calculated: {

- const CalculationValue& calc = length.calculationValue();

+ const CalculationValue& calc = length.getCalculationValue();

if (calc.pixels() && calc.percent()) {

init(CSSCalcValue::create(

CSSCalcValue::createExpressionNode(calc.pixels() / zoom, calc.percent()),

- calc.valueRange()));

+ calc.getValueRange()));

break;

}

if (calc.percent()) {