third_party/WebKit/Source/platform/animation/TimingFunction.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/platform/animation/TimingFunction.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/platform/animation/TimingFunction.h ('k') | third_party/WebKit/Source/platform/audio/Panner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/animation/TimingFunction.cpp

diff --git a/third_party/WebKit/Source/platform/animation/TimingFunction.cpp b/third_party/WebKit/Source/platform/animation/TimingFunction.cpp

index 470569ec8cb3f356f419b8deb27b322d78b0dc89..1b504f074fcc3961b1d992da0014e6a55375d7af 100644

--- a/third_party/WebKit/Source/platform/animation/TimingFunction.cpp

+++ b/third_party/WebKit/Source/platform/animation/TimingFunction.cpp

@@ -253,7 +253,7 @@ void CubicBezierTimingFunction::partition(Vector<PartitionRegion>& regions) cons

String StepsTimingFunction::toString() const

{

const char* positionString = nullptr;

- switch (stepAtPosition()) {

+ switch (getStepAtPosition()) {

case Start:

positionString = "start";

break;

@@ -368,7 +368,7 @@ bool operator==(const StepsTimingFunction& lhs, const TimingFunction& rhs)

return false;

const StepsTimingFunction& stf = toStepsTimingFunction(rhs);

- return (lhs.numberOfSteps() == stf.numberOfSteps()) && (lhs.stepAtPosition() == stf.stepAtPosition());

+ return (lhs.numberOfSteps() == stf.numberOfSteps()) && (lhs.getStepAtPosition() == stf.getStepAtPosition());

}

// The generic operator== *must* come after the

« no previous file with comments | « third_party/WebKit/Source/platform/animation/TimingFunction.h ('k') | third_party/WebKit/Source/platform/audio/Panner.h » ('j') | no next file with comments »