Source/WebCore/svg/SVGAnimateElement.cpp - Issue 11184044: Merge 130777 - Prevent animation when CSS attributeType is invalid.

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: Source/WebCore/svg/SVGAnimateElement.cpp

Issue 11184044: Merge 130777 - Prevent animation when CSS attributeType is invalid. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/

Patch Set: Created 8 years, 2 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 | « LayoutTests/svg/animations/script-tests/animate-css-xml-attributeType.js ('k') | Source/WebCore/svg/SVGAnimationElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/svg/SVGAnimateElement.cpp

===================================================================

--- Source/WebCore/svg/SVGAnimateElement.cpp (revision 131765)

+++ Source/WebCore/svg/SVGAnimateElement.cpp (working copy)

@@ -56,8 +56,8 @@

SVGElement* targetElement = this->targetElement();

if (!targetElement)

return false;

- return m_animatedPropertyType != AnimatedUnknown;

+ return m_animatedPropertyType != AnimatedUnknown && !hasInvalidCSSAttributeType();

}

AnimatedPropertyType SVGAnimateElement::determineAnimatedPropertyType(SVGElement* targetElement) const

@@ -398,7 +398,7 @@

void SVGAnimateElement::targetElementWillChange(SVGElement* currentTarget, SVGElement* newTarget)

{

- SVGSMILElement::targetElementWillChange(currentTarget, newTarget);

+ SVGAnimationElement::targetElementWillChange(currentTarget, newTarget);

ASSERT(!m_animatedType);

m_fromType.clear();