Bug 534028, Patch E: Tests for SMIL animation of mapped attributes interacting with CSS transitions. r=tests-only
authorDaniel Holbert <dholbert@cs.stanford.edu>
Tue, 16 Mar 2010 16:17:47 -0700
changeset 39490 9e96f8553258
parent 39489 cf62ca96cd0d
child 39491 637a23219852
push id12227
push userdholbert@mozilla.com
push dateTue, 16 Mar 2010 23:20:42 +0000
treeherdermozilla-central@9e96f8553258 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstests-only
bugs534028
milestone1.9.3a4pre
Bug 534028, Patch E: Tests for SMIL animation of mapped attributes interacting with CSS transitions. r=tests-only
layout/reftests/svg/smil/reftest.list
layout/reftests/svg/smil/smil-transitions-interaction-1.svg
layout/reftests/svg/smil/smil-transitions-interaction-1a.svg
layout/reftests/svg/smil/smil-transitions-interaction-1b.svg
layout/reftests/svg/smil/smil-transitions-interaction-2.svg
layout/reftests/svg/smil/smil-transitions-interaction-2a.svg
layout/reftests/svg/smil/smil-transitions-interaction-2b.svg
layout/reftests/svg/smil/smil-transitions-interaction-3.svg
layout/reftests/svg/smil/smil-transitions-interaction-3a.svg
layout/reftests/svg/smil/smil-transitions-interaction-3b.svg
layout/reftests/svg/smil/smil-transitions-interaction-4.svg
layout/reftests/svg/smil/smil-transitions-interaction-4a.svg
layout/reftests/svg/smil/smil-transitions-interaction-4b.svg
--- a/layout/reftests/svg/smil/reftest.list
+++ b/layout/reftests/svg/smil/reftest.list
@@ -160,12 +160,16 @@ fails == anim-strokecolor-1.svg anim-sta
 == freeze-applied-late-4.svg anim-standard-ref.svg
 
 == inactivate-with-active-unchanged-1.svg anim-standard-ref.svg
 == inactivate-with-active-unchanged-2.svg anim-standard-ref.svg
 
 # interaction between xml mapped attributes and their css equivalents
 == mapped-attr-vs-css-prop-1.svg lime.svg
 
-== smil-transitions-interaction-1.svg lime.svg
-== smil-transitions-interaction-2.svg lime.svg
-== smil-transitions-interaction-3.svg lime.svg
-== smil-transitions-interaction-4.svg lime.svg
+== smil-transitions-interaction-1a.svg lime.svg
+== smil-transitions-interaction-1b.svg lime.svg
+== smil-transitions-interaction-2a.svg lime.svg
+== smil-transitions-interaction-2b.svg lime.svg
+== smil-transitions-interaction-3a.svg lime.svg
+== smil-transitions-interaction-3b.svg lime.svg
+== smil-transitions-interaction-4a.svg lime.svg
+== smil-transitions-interaction-4b.svg lime.svg
rename from layout/reftests/svg/smil/smil-transitions-interaction-1.svg
rename to layout/reftests/svg/smil/smil-transitions-interaction-1a.svg
copy from layout/reftests/svg/smil/smil-transitions-interaction-1.svg
copy to layout/reftests/svg/smil/smil-transitions-interaction-1b.svg
--- a/layout/reftests/svg/smil/smil-transitions-interaction-1.svg
+++ b/layout/reftests/svg/smil/smil-transitions-interaction-1b.svg
@@ -1,12 +1,13 @@
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
      class="reftest-wait"
      onload="setTimeAndSnapshot(1.0, true)">
   <!-- This test checks that we don't trigger a CSS transition when
        SMIL animation effects are first applied. -->
   <script xlink:href="smil-util.js" type="text/javascript"/>
-  <rect width="100%" height="100%"
-        style="fill: red; -moz-transition: 200s fill">
-    <set attributeName="fill" to="lime" begin="1s" dur="indefinite"/>
+  <rect width="100%" height="100%" fill="red"
+        style="-moz-transition: 200s fill">
+    <set attributeName="fill" attributeType="XML"
+         to="lime" begin="1s" dur="indefinite"/>
   </rect>
 </svg>
rename from layout/reftests/svg/smil/smil-transitions-interaction-2.svg
rename to layout/reftests/svg/smil/smil-transitions-interaction-2a.svg
copy from layout/reftests/svg/smil/smil-transitions-interaction-2.svg
copy to layout/reftests/svg/smil/smil-transitions-interaction-2b.svg
--- a/layout/reftests/svg/smil/smil-transitions-interaction-2.svg
+++ b/layout/reftests/svg/smil/smil-transitions-interaction-2b.svg
@@ -1,12 +1,13 @@
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
      class="reftest-wait"
      onload="setTimeAndSnapshot(1.0, true)">
   <!-- This test checks that we don't trigger a CSS transition after
        SMIL animation effects are applied. -->
   <script xlink:href="smil-util.js" type="text/javascript"/>
-  <rect width="100%" height="100%"
-        style="fill: red; -moz-transition: 1s fill">
-    <set attributeName="fill" to="lime" begin="1s" dur="indefinite"/>
+  <rect width="100%" height="100%" fill="red"
+        style="-moz-transition: 1s fill">
+    <set attributeName="fill" attributeType="XML"
+         to="lime" begin="1s" dur="indefinite"/>
   </rect>
 </svg>
rename from layout/reftests/svg/smil/smil-transitions-interaction-3.svg
rename to layout/reftests/svg/smil/smil-transitions-interaction-3a.svg
copy from layout/reftests/svg/smil/smil-transitions-interaction-3.svg
copy to layout/reftests/svg/smil/smil-transitions-interaction-3b.svg
--- a/layout/reftests/svg/smil/smil-transitions-interaction-3.svg
+++ b/layout/reftests/svg/smil/smil-transitions-interaction-3b.svg
@@ -2,13 +2,14 @@
      xmlns:xlink="http://www.w3.org/1999/xlink"
      class="reftest-wait"
      onload="document.documentElement.pauseAnimations();
              document.documentElement.setCurrentTime(1.0);
              setTimeAndSnapshot(2.0, false)">
   <!-- This test checks that we don't trigger a CSS transition when
        SMIL animation effects are removed. -->
   <script xlink:href="smil-util.js" type="text/javascript"/>
-  <rect width="100%" height="100%"
-        style="fill: lime; -moz-transition: 200s fill">
-    <set attributeName="fill" to="red" begin="1s" dur="1s"/>
+  <rect width="100%" height="100%" fill="lime"
+        style="-moz-transition: 200s fill">
+    <set attributeName="fill" attributeType="XML"
+         to="red" begin="1s" dur="1s"/>
   </rect>
 </svg>
rename from layout/reftests/svg/smil/smil-transitions-interaction-4.svg
rename to layout/reftests/svg/smil/smil-transitions-interaction-4a.svg
--- a/layout/reftests/svg/smil/smil-transitions-interaction-4.svg
+++ b/layout/reftests/svg/smil/smil-transitions-interaction-4a.svg
@@ -5,17 +5,17 @@
              document.documentElement.setCurrentTime(1.0);
              setTimeAndSnapshot(1.5, false)">
   <!-- This test checks that we don't trigger a CSS transition during
        interpolation from-to animation. We seek to 1.5s, halfway through the
        animation, when we're *just* to the point where the lime stroke is wide
        enough to cover up the red rect behind it. If a transition were to
        start, it would slow us down and allow some red to show.
     -->
-       <script xlink:href="smil-util.js" type="text/javascript"/>
-       <rect width="100%" height="100%" style="fill: lime"/> <rect width="30"
-       height="30" style="fill: red"/>
+  <script xlink:href="smil-util.js" type="text/javascript"/>
+  <rect width="100%" height="100%" style="fill: lime"/>
+  <rect width="30" height="30" style="fill: red"/>
   <rect width="20" height="20"
         style="fill: lime; stroke: lime; -moz-transition: 200s stroke-width">
     <animate attributeName="stroke-width" from="10px" to="30px"
              begin="1s" dur="1s" fill="freeze"/>
   </rect>
 </svg>
copy from layout/reftests/svg/smil/smil-transitions-interaction-4.svg
copy to layout/reftests/svg/smil/smil-transitions-interaction-4b.svg
--- a/layout/reftests/svg/smil/smil-transitions-interaction-4.svg
+++ b/layout/reftests/svg/smil/smil-transitions-interaction-4b.svg
@@ -5,17 +5,17 @@
              document.documentElement.setCurrentTime(1.0);
              setTimeAndSnapshot(1.5, false)">
   <!-- This test checks that we don't trigger a CSS transition during
        interpolation from-to animation. We seek to 1.5s, halfway through the
        animation, when we're *just* to the point where the lime stroke is wide
        enough to cover up the red rect behind it. If a transition were to
        start, it would slow us down and allow some red to show.
     -->
-       <script xlink:href="smil-util.js" type="text/javascript"/>
-       <rect width="100%" height="100%" style="fill: lime"/> <rect width="30"
-       height="30" style="fill: red"/>
+  <script xlink:href="smil-util.js" type="text/javascript"/>
+  <rect width="100%" height="100%" style="fill: lime"/>
+  <rect width="30" height="30" style="fill: red"/>
   <rect width="20" height="20"
         style="fill: lime; stroke: lime; -moz-transition: 200s stroke-width">
-    <animate attributeName="stroke-width" from="10px" to="30px"
-             begin="1s" dur="1s" fill="freeze"/>
+    <animate attributeName="stroke-width" attributeType="XML"
+             from="10px" to="30px" begin="1s" dur="1s" fill="freeze"/>
   </rect>
 </svg>