<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179963] branches/safari-600.5-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179963">179963</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-11 14:48:56 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/179772">r179772</a>. rdar://problem/19771772</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsChangeLog">branches/safari-600.5-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoresvgSVGAnimateElementcpp">branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimateElement.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoresvgSVGAnimationElementcpp">branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimationElement.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoresvgSVGAnimationElementh">branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimationElement.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestssvganimationsanimatemontioninvalidattributeexpectedsvg">branches/safari-600.5-branch/LayoutTests/svg/animations/animate-montion-invalid-attribute-expected.svg</a></li>
<li><a href="#branchessafari6005branchLayoutTestssvganimationsanimatemontioninvalidattributesvg">branches/safari-600.5-branch/LayoutTests/svg/animations/animate-montion-invalid-attribute.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (179962 => 179963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-02-11 22:48:27 UTC (rev 179962)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-02-11 22:48:56 UTC (rev 179963)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-02-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179772
+
+ 2015-02-06 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Invalid cast in WebCore::SVGAnimateElement::calculateAnimatedValue.
+ https://bugs.webkit.org/show_bug.cgi?id=135171.
+
+ Reviewed by Dean Jackson.
+
+ * svg/animations/animate-montion-invalid-attribute-expected.svg: Added.
+ * svg/animations/animate-montion-invalid-attribute.svg: Added.
+ Make sure that adding the same attribute to <animateMotion> and <animate>, which both
+ animate the same target element, will be ignored and we won't crash.
+
+2015-02-11 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r179691
</span><span class="cx">
</span><span class="cx"> 2015-02-05 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchLayoutTestssvganimationsanimatemontioninvalidattributeexpectedsvgfromrev179772trunkLayoutTestssvganimationsanimatemontioninvalidattributeexpectedsvg"></a>
<div class="copfile"><h4>Copied: branches/safari-600.5-branch/LayoutTests/svg/animations/animate-montion-invalid-attribute-expected.svg (from rev 179772, trunk/LayoutTests/svg/animations/animate-montion-invalid-attribute-expected.svg) (0 => 179963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/svg/animations/animate-montion-invalid-attribute-expected.svg (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/svg/animations/animate-montion-invalid-attribute-expected.svg 2015-02-11 22:48:56 UTC (rev 179963)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg">
+ <circle cx="60" cy="60" r="50" fill="Lime"/>
+ <circle cx="160" cy="160" r="50" fill="Green"/>
+</svg>
</ins></span></pre></div>
<a id="branchessafari6005branchLayoutTestssvganimationsanimatemontioninvalidattributesvgfromrev179772trunkLayoutTestssvganimationsanimatemontioninvalidattributesvg"></a>
<div class="copfile"><h4>Copied: branches/safari-600.5-branch/LayoutTests/svg/animations/animate-montion-invalid-attribute.svg (from rev 179772, trunk/LayoutTests/svg/animations/animate-montion-invalid-attribute.svg) (0 => 179963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/svg/animations/animate-montion-invalid-attribute.svg (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/svg/animations/animate-montion-invalid-attribute.svg 2015-02-11 22:48:56 UTC (rev 179963)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg">
+ <circle cx="60" cy="60" r="50" fill="DarkRed">
+ <!-- animateMotion should not have animation attribute target attributes -->
+ <animateMotion attributeName="fill"
+ path="M 0 0 L 100 100"
+ begin="0ms"
+ dur="100ms"
+ fill="freeze"/>
+ <animateColor attributeName="fill"
+ attributeType="XML"
+ from="DarkRed"
+ to="Green"
+ begin="0ms"
+ dur="100ms"
+ fill="freeze"/>
+ </circle>
+ <circle cx="160" cy="160" r="50" fill="Red">
+ <!-- animateMotion should not have animation attribute target attributes -->
+ <animateMotion attributeName="fill"
+ path="M 0 0 L -100 -100"
+ begin="0ms"
+ dur="100ms"
+ fill="freeze"/>
+ <animate attributeName="fill"
+ attributeType="XML"
+ from="Red"
+ to="Lime"
+ begin="0ms"
+ dur="100ms"
+ fill="freeze"/>
+ </circle>
+ <script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ window.setTimeout(function() { testRunner.notifyDone(); }, 500);
+ }
+ </script>
+</svg>
</ins></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (179962 => 179963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-11 22:48:27 UTC (rev 179962)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-11 22:48:56 UTC (rev 179963)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2015-02-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179772
+
+ 2015-02-06 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Invalid cast in WebCore::SVGAnimateElement::calculateAnimatedValue.
+ https://bugs.webkit.org/show_bug.cgi?id=135171.
+
+ Reviewed by Dean Jackson.
+
+ The bug happens when an SVG element is animated by <animateMotion> followed by an
+ <animateColor> or an <animate> and the values of the "attributeName" in both elements
+ are the same. The problem is <animateMotion> should not have an attribute to animate.
+ If it does by fuzz or by mistake, then we assume the <animateMotion> and the <animate>
+ animate the same attribute for the same element target. Therefore we schedule them in
+ the same AnimationVector in SMILTimeContainer::schedule(). When we call
+ SVGAnimateElementBase::calculateAnimatedValue() for an SVGAnimateColorElement and the
+ resultElement is SVGAnimateMotionElement, we fail to cast it to SVGAnimateElementBase
+ because SVGAnimateMotionElement is derived from SVGAnimationElement which is the base
+ class of all animate elements including SVGAnimateElementBase.
+
+ The fix is to nullify setting "attributeName" of an SVGAnimationElement. By doing so,
+ "attributeName" and its value will be ignored from the <animateMotion> which is correct.
+
+ Tests: svg/animations/animate-montion-invalid-attribute.svg.
+
+ * svg/SVGAnimateElementBase.cpp:
+ (WebCore::SVGAnimateElementBase::setAttributeName):
+ Do not call SVGAnimationElement::setAttributeName() since SVGAnimationElement should
+ not have an attribute to animate. We prevent this by bypassing the parent in the class
+ hierarchy: SVGAnimationElement and calling SVGSMILElement::setAttributeName() directly.
+
+ * svg/SVGAnimationElement.cpp:
+ (WebCore::SVGAnimationElement::setAttributeName): Deleted.
+ * svg/SVGAnimationElement.h:
+ SVGAnimationElement should not have an attribute to animate. So implement its
+ setAttributeName() as a null function.
+
+2015-02-11 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r179691
</span><span class="cx">
</span><span class="cx"> 2015-02-05 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoresvgSVGAnimateElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimateElement.cpp (179962 => 179963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimateElement.cpp 2015-02-11 22:48:27 UTC (rev 179962)
+++ branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimateElement.cpp 2015-02-11 22:48:56 UTC (rev 179963)
</span><span class="lines">@@ -425,7 +425,8 @@
</span><span class="cx">
</span><span class="cx"> void SVGAnimateElement::setAttributeName(const QualifiedName& attributeName)
</span><span class="cx"> {
</span><del>- SVGAnimationElement::setAttributeName(attributeName);
</del><ins>+ SVGSMILElement::setAttributeName(attributeName);
+ checkInvalidCSSAttributeType(targetElement());
</ins><span class="cx"> resetAnimatedPropertyType();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoresvgSVGAnimationElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimationElement.cpp (179962 => 179963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimationElement.cpp 2015-02-11 22:48:27 UTC (rev 179962)
+++ branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimationElement.cpp 2015-02-11 22:48:56 UTC (rev 179963)
</span><span class="lines">@@ -682,12 +682,6 @@
</span><span class="cx"> checkInvalidCSSAttributeType(target);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGAnimationElement::setAttributeName(const QualifiedName& attributeName)
-{
- SVGSMILElement::setAttributeName(attributeName);
- checkInvalidCSSAttributeType(targetElement());
-}
-
</del><span class="cx"> void SVGAnimationElement::checkInvalidCSSAttributeType(SVGElement* target)
</span><span class="cx"> {
</span><span class="cx"> m_hasInvalidCSSAttributeType = target && hasValidAttributeName() && attributeType() == AttributeTypeCSS && !isTargetAttributeCSSProperty(target, attributeName());
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoresvgSVGAnimationElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimationElement.h (179962 => 179963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimationElement.h 2015-02-11 22:48:27 UTC (rev 179962)
+++ branches/safari-600.5-branch/Source/WebCore/svg/SVGAnimationElement.h 2015-02-11 22:48:56 UTC (rev 179963)
</span><span class="lines">@@ -193,8 +193,9 @@
</span><span class="cx"> AnimatedPropertyValueType m_toPropertyValueType;
</span><span class="cx">
</span><span class="cx"> virtual void setTargetElement(SVGElement*) override;
</span><del>- virtual void setAttributeName(const QualifiedName&) override;
</del><ins>+ virtual void setAttributeName(const QualifiedName&) override { }
</ins><span class="cx"> bool hasInvalidCSSAttributeType() const { return m_hasInvalidCSSAttributeType; }
</span><ins>+ void checkInvalidCSSAttributeType(SVGElement*);
</ins><span class="cx">
</span><span class="cx"> virtual void updateAnimationMode();
</span><span class="cx"> void setAnimationMode(AnimationMode animationMode) { m_animationMode = animationMode; }
</span><span class="lines">@@ -204,8 +205,6 @@
</span><span class="cx"> virtual void animationAttributeChanged() override;
</span><span class="cx"> void setAttributeType(const AtomicString&);
</span><span class="cx">
</span><del>- void checkInvalidCSSAttributeType(SVGElement*);
-
</del><span class="cx"> virtual bool calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString) = 0;
</span><span class="cx"> virtual bool calculateFromAndToValues(const String& fromString, const String& toString) = 0;
</span><span class="cx"> virtual bool calculateFromAndByValues(const String& fromString, const String& byString) = 0;
</span></span></pre>
</div>
</div>
</body>
</html>