Bug 1355348 - Don't return early when sampling SMIL animations with Servo backend; r=heycam
authorBrian Birtles <birtles@gmail.com>
Wed, 26 Apr 2017 13:00:12 +0900
changeset 405765 33f064e9137d79700a6c943c8a9467fbffc80f85
parent 405764 f1bd37850558adee8d03085d77eb1809af51cb63
child 405766 e0bab3ab79ffa8a0f5afce954004fd5ced37b059
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersheycam
bugs1355348
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1355348 - Don't return early when sampling SMIL animations with Servo backend; r=heycam MozReview-Commit-ID: 26PxOSB9C9l
dom/smil/nsSMILAnimationController.cpp
layout/reftests/svg/smil/container/reftest-stylo.list
layout/reftests/svg/smil/seek/reftest-stylo.list
--- a/dom/smil/nsSMILAnimationController.cpp
+++ b/dom/smil/nsSMILAnimationController.cpp
@@ -323,21 +323,16 @@ nsSMILAnimationController::DoSample(bool
   if (mRunningSample) {
     NS_ERROR("Shouldn't be recursively sampling");
     return;
   }
 
   bool isStyleFlushNeeded = mResampleNeeded;
   mResampleNeeded = false;
 
-  if (mDocument->IsStyledByServo()) {
-    NS_WARNING("stylo: SMIL animations not supported yet");
-    return;
-  }
-
   nsCOMPtr<nsIDocument> document(mDocument);  // keeps 'this' alive too
 
   // Set running sample flag -- do this before flushing styles so that when we
   // flush styles we don't end up requesting extra samples
   AutoRestore<bool> autoRestoreRunningSample(mRunningSample);
   mRunningSample = true;
 
   // STEP 1: Bring model up to date
--- a/layout/reftests/svg/smil/container/reftest-stylo.list
+++ b/layout/reftests/svg/smil/container/reftest-stylo.list
@@ -1,19 +1,19 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 # Tests related to SVG Animation (using SMIL), focusing on animation-sorting
 # to see which animation takes precedence (out of multiple animations on the
 # same attribute)
 
 random == enveloped-tree-1.xhtml enveloped-tree-1.xhtml
-fails == promoted-tree-1.xhtml promoted-tree-1.xhtml
+== promoted-tree-1.xhtml promoted-tree-1.xhtml
 random == moved-tree-1.xhtml moved-tree-1.xhtml
 fails == deferred-anim-1.xhtml deferred-anim-1.xhtml
 fails == deferred-tree-1.xhtml deferred-tree-1.xhtml
 == deferred-tree-2a.xhtml deferred-tree-2a.xhtml
 == deferred-tree-2b.xhtml deferred-tree-2b.xhtml
-fails == deferred-tree-3a.xhtml deferred-tree-3a.xhtml
-fails == deferred-tree-3b.xhtml deferred-tree-3b.xhtml
-fails == deferred-tree-3c.xhtml deferred-tree-3c.xhtml
-fails == deferred-tree-3d.xhtml deferred-tree-3d.xhtml
+== deferred-tree-3a.xhtml deferred-tree-3a.xhtml
+== deferred-tree-3b.xhtml deferred-tree-3b.xhtml
+== deferred-tree-3c.xhtml deferred-tree-3c.xhtml
+== deferred-tree-3d.xhtml deferred-tree-3d.xhtml
 # this will occasionally fail until we correctly clear animation effects from
 # no-longer-targeted elements
 random == invalid-elem-1.xhtml invalid-elem-1.xhtml
--- a/layout/reftests/svg/smil/seek/reftest-stylo.list
+++ b/layout/reftests/svg/smil/seek/reftest-stylo.list
@@ -10,9 +10,9 @@
 == anim-x-seek-dynamic-1c.svg anim-x-seek-dynamic-1c.svg
 == anim-x-seek-dynamic-1d.svg anim-x-seek-dynamic-1d.svg
 == anim-x-seek-dynamic-1e.svg anim-x-seek-dynamic-1e.svg
 == anim-x-seek-dynamic-1f.svg anim-x-seek-dynamic-1f.svg
 == anim-x-seek-dynamic-1g.svg anim-x-seek-dynamic-1g.svg
 == anim-x-seek-dynamic-1h.svg anim-x-seek-dynamic-1h.svg
 == anim-x-seek-dynamic-1i.svg anim-x-seek-dynamic-1i.svg
 == anim-x-seek-negative-1a.svg anim-x-seek-negative-1a.svg
-fails == anim-x-seek-cross-container-1a.xhtml anim-x-seek-cross-container-1a.xhtml
+== anim-x-seek-cross-container-1a.xhtml anim-x-seek-cross-container-1a.xhtml