third_party/WebKit/Source/core/svg/SVGAnimateMotionElement.cpp - Issue 1743863002: Rename enums/functions that collide in chromium style in core/svg,xml

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/svg/SVGAnimateMotionElement.cpp

Issue 1743863002: Rename enums/functions that collide in chromium style in core/svg,xml (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-10: 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/core/svg/SVGAnimateElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGAnimateTransformElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/svg/SVGAnimateMotionElement.cpp

diff --git a/third_party/WebKit/Source/core/svg/SVGAnimateMotionElement.cpp b/third_party/WebKit/Source/core/svg/SVGAnimateMotionElement.cpp

index 87d5fbe6a2cb412f2f0bf8db67d998e976de4225..95a190a795af45764981266765a51f3f2888f931 100644

--- a/third_party/WebKit/Source/core/svg/SVGAnimateMotionElement.cpp

+++ b/third_party/WebKit/Source/core/svg/SVGAnimateMotionElement.cpp

@@ -208,7 +208,7 @@ bool SVGAnimateMotionElement::calculateFromAndToValues(const String& fromString,

bool SVGAnimateMotionElement::calculateFromAndByValues(const String& fromString, const String& byString)

{

m_hasToPointAtEndOfDuration = false;

- if (animationMode() == ByAnimation && !isAdditive())

+ if (getAnimationMode() == ByAnimation && !isAdditive())

return false;

parsePoint(fromString, m_fromPoint);

FloatPoint byPoint;

@@ -232,7 +232,7 @@ void SVGAnimateMotionElement::calculateAnimatedValue(float percentage, unsigned

if (!isAdditive())

transform->makeIdentity();

- if (animationMode() != PathAnimation) {

+ if (getAnimationMode() != PathAnimation) {

FloatPoint toPointAtEndOfDuration = m_toPoint;

if (isAccumulated() && repeatCount && m_hasToPointAtEndOfDuration)

toPointAtEndOfDuration = m_toPointAtEndOfDuration;