From 59513799f4c774e9cbeb089ecba41e5eda831556 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Thu, 29 May 2014 10:56:01 +0100
Subject: [PATCH] Backed out changeset 743bd08df703 (bug 854421)

---
 layout/base/nsPresShell.cpp     | 1 +
 layout/base/nsRefreshDriver.cpp | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 2b3783d0b515..f43197649862 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -4037,6 +4037,7 @@ PresShell::FlushPendingNotifications(mozilla::ChangesToFlush aFlush)
       }
 
       if (aFlush.mFlushAnimations &&
+          nsLayoutUtils::AreAsyncAnimationsEnabled() &&
           !mPresContext->StyleUpdateForAllAnimationsIsUpToDate()) {
         mPresContext->AnimationManager()->
           FlushAnimations(CommonAnimationManager::Cannot_Throttle);
diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index 4c9be96de082..3c1cf84efd90 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -1096,8 +1096,6 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
     }
 
     if (i == 0) {
-      // This is the Flush_Style case.
-
       // Grab all of our frame request callbacks up front.
       nsTArray<DocumentFrameCallbacks>
         frameRequestCallbacks(mFrameRequestCallbackDocs.Length());
@@ -1139,6 +1137,7 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
       }
       profiler_tracing("Paint", "Scripts", TRACING_INTERVAL_END);
 
+      // This is the Flush_Style case.
       if (mPresContext && mPresContext->GetPresShell()) {
         bool tracingStyleFlush = false;
         nsAutoTArray<nsIPresShell*, 16> observers;
@@ -1168,10 +1167,6 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
           profiler_tracing("Paint", "Styles", TRACING_INTERVAL_END);
         }
       }
-
-      if (!nsLayoutUtils::AreAsyncAnimationsEnabled()) {
-        mPresContext->TickLastStyleUpdateForAllAnimations();
-      }
     } else if  (i == 1) {
       // This is the Flush_Layout case.
       if (mPresContext && mPresContext->GetPresShell()) {