Bug 960465 patch 15 - Switch debugging user of IsProcessingAnimationOnlyStyleUpdate() to InAnimationOnlyStyleUpdate() so that I can remove the former. r=birtles

layout/base/RestyleManager.h

@@ -19,6 +19,7 @@
 #include "nsRefreshDriver.h"
 #include "nsRefPtrHashtable.h"
 #include "nsCSSPseudoElements.h"
+#include "nsTransitionManager.h"
 
 class nsIFrame;
 class nsStyleChangeList;
@@ -433,8 +434,8 @@ public:
    */
   static bool ShouldLogRestyle(nsPresContext* aPresContext) {
     return aPresContext->RestyleLoggingEnabled() &&
-           (!aPresContext->RestyleManager()->
-               IsProcessingAnimationStyleChange() ||
+           (!aPresContext->TransitionManager()->
+               InAnimationOnlyStyleUpdate() ||
             AnimationRestyleLoggingEnabled());
   }
 

layout/base/RestyleTracker.cpp

@@ -16,6 +16,7 @@
 #include "nsStyleChangeList.h"
 #include "RestyleManager.h"
 #include "RestyleTrackerInlines.h"
+#include "nsTransitionManager.h"
 
 namespace mozilla {
 
@@ -221,7 +222,8 @@ RestyleTracker::DoProcessRestyles()
 
     LOG_RESTYLE("Processing %d pending %srestyles with %d restyle roots for %s",
                 mPendingRestyles.Count(),
-                mRestyleManager->IsProcessingAnimationStyleChange()
+                mRestyleManager->PresContext()->TransitionManager()->
+                  InAnimationOnlyStyleUpdate()
                   ? (const char*) "animation " : (const char*) "",
                 static_cast<int>(mRestyleRoots.Length()),
                 GetDocumentURI(Document()).get());

layout/forms/moz.build

@@ -48,6 +48,7 @@ LOCAL_INCLUDES += [
     '../../editor/txmgr',
     '../base',
     '../generic',
+    '../style',
     '../xul',
     '/dom/base',
     '/dom/html',

layout/style/nsTransitionManager.h

@@ -132,6 +132,10 @@ public:
     mInAnimationOnlyStyleUpdate = aInAnimationOnlyUpdate;
   }
 
+  bool InAnimationOnlyStyleUpdate() const {
+    return mInAnimationOnlyStyleUpdate;
+  }
+
   virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
     MOZ_MUST_OVERRIDE MOZ_OVERRIDE;
   virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const