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

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

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

index 72adceb0028d211a295ba523943ab04f8d0de5c9..131aa14388611996269489b35ee3808446f02624 100644

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

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

@@ -112,7 +112,7 @@ void SVGRect::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*)

void SVGRect::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> fromValue, PassRefPtrWillBeRawPtr<SVGPropertyBase> toValue, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement*)

{

ASSERT(animationElement);

- RefPtrWillBeRawPtr<SVGRect> fromRect = animationElement->animationMode() == ToAnimation ? PassRefPtrWillBeRawPtr<SVGRect>(this) : toSVGRect(fromValue);

+ RefPtrWillBeRawPtr<SVGRect> fromRect = animationElement->getAnimationMode() == ToAnimation ? PassRefPtrWillBeRawPtr<SVGRect>(this) : toSVGRect(fromValue);

RefPtrWillBeRawPtr<SVGRect> toRect = toSVGRect(toValue);

RefPtrWillBeRawPtr<SVGRect> toAtEndOfDurationRect = toSVGRect(toAtEndOfDurationValue);

« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGPointList.cpp ('k') | third_party/WebKit/Source/core/svg/SVGTransformList.cpp » ('j') | no next file with comments »