third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.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/ComputedStyleCSSValueMapping.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/css/CSSTimingFunctionValue.h ('k') | third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c38c93d7f3ef1190b9b321c5efebab6c0a44bf26..9c23583ba77602e652bfecd20d267eb1fe6ac18c 100644

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

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

@@ -827,7 +827,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> createTimingFunctionValue(const TimingFu

case TimingFunction::StepsFunction:

{

const StepsTimingFunction* stepsTimingFunction = toStepsTimingFunction(timingFunction);

- StepsTimingFunction::StepAtPosition position = stepsTimingFunction->stepAtPosition();

+ StepsTimingFunction::StepAtPosition position = stepsTimingFunction->getStepAtPosition();

int steps = stepsTimingFunction->numberOfSteps();

ASSERT(position == StepsTimingFunction::Start || position == StepsTimingFunction::End);

@@ -1255,7 +1255,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::valueForFilter(co

DropShadowFilterOperation* dropShadowOperation = toDropShadowFilterOperation(filterOperation);

filterValue = CSSFunctionValue::create(CSSValueDropShadow);

// We want our computed style to look like that of a text shadow (has neither spread nor inset style).

- ShadowData shadow(dropShadowOperation->location(), dropShadowOperation->stdDeviation(), 0, Normal, StyleColor(dropShadowOperation->color()));

+ ShadowData shadow(dropShadowOperation->location(), dropShadowOperation->stdDeviation(), 0, Normal, StyleColor(dropShadowOperation->getColor()));

filterValue->append(valueForShadowData(shadow, style, false));

break;

}

@@ -2088,7 +2088,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID

case CSSPropertyResize:

return cssValuePool().createValue(style.resize());

case CSSPropertyFontKerning:

- return cssValuePool().createValue(style.fontDescription().kerning());

+ return cssValuePool().createValue(style.fontDescription().getKerning());

case CSSPropertyWebkitFontSmoothing:

return cssValuePool().createValue(style.fontDescription().fontSmoothing());

case CSSPropertyFontVariantLigatures: {