third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.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/SVGAnimatedTypeAnimator.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/SVGAnimateTransformElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGAnimationElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 31888a30059a5ab6f1eb59c332894a502bd89201..7ec3b067a2086e0aa53bc8e1f89a2aebdc77f773 100644

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

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

@@ -237,7 +237,7 @@ void SVGAnimatedTypeAnimator::calculateAnimatedValue(float percentage, unsigned

ASSERT(m_animationElement);

ASSERT(m_contextElement);

- RefPtrWillBeRawPtr<SVGPropertyBase> fromValue = m_animationElement->animationMode() == ToAnimation ? animated : from;

+ RefPtrWillBeRawPtr<SVGPropertyBase> fromValue = m_animationElement->getAnimationMode() == ToAnimation ? animated : from;

RefPtrWillBeRawPtr<SVGPropertyBase> toValue = to;

RefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDurationValue = toAtEndOfDuration;

RefPtrWillBeRawPtr<SVGPropertyBase> animatedValue = animated;