--- a/layout/base/ActiveLayerTracker.cpp
+++ b/layout/base/ActiveLayerTracker.cpp
@@ -5,16 +5,18 @@
 #include "ActiveLayerTracker.h"
 
 #include "nsExpirationTracker.h"
 #include "nsIFrame.h"
 #include "nsIContent.h"
 #include "nsRefreshDriver.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDocument.h"
+#include "nsAnimationManager.h"
+#include "nsTransitionManager.h"
 
 namespace mozilla {
 
 /**
  * This tracks the state of a frame that may need active layers due to
  * ongoing content changes or style changes that indicate animation.
  *
  * When no changes of *any* kind are detected after 75-100ms we remove this
@@ -210,16 +212,28 @@ ActiveLayerTracker::IsStyleAnimated(nsIF
   if (layerActivity) {
     if (layerActivity->RestyleCountForProperty(aProperty) >= 2) {
       return true;
     }
   }
   if (aProperty == eCSSProperty_transform && aFrame->Preserves3D()) {
     return IsStyleAnimated(aFrame->GetParent(), aProperty);
   }
+  nsIContent* content = aFrame->GetContent();
+  if (content) {
+    if (mozilla::HasAnimationOrTransition<ElementAnimations>(
+          content, nsGkAtoms::animationsProperty, aProperty)) {
+      return true;
+    }
+    if (mozilla::HasAnimationOrTransition<ElementTransitions>(
+          content, nsGkAtoms::transitionsProperty, aProperty)) {
+      return true;
+    }
+  }
+
   return false;
 }
 
 /* static */ bool
 ActiveLayerTracker::IsOffsetOrMarginStyleAnimated(nsIFrame* aFrame)
 {
   LayerActivity* layerActivity = GetLayerActivity(aFrame);
   if (layerActivity) {

--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -225,33 +225,44 @@ nsLayoutUtils::HasAnimationsForComposito
     return false;
   return HasAnimationOrTransitionForCompositor<ElementAnimations>
             (aContent, nsGkAtoms::animationsProperty, aProperty) ||
          HasAnimationOrTransitionForCompositor<ElementTransitions>
             (aContent, nsGkAtoms::transitionsProperty, aProperty);
 }
 
 template <class AnimationsOrTransitions>
-static AnimationsOrTransitions*
-HasAnimationOrTransition(nsIContent* aContent,
+AnimationsOrTransitions*
+mozilla::HasAnimationOrTransition(nsIContent* aContent,
                          nsIAtom* aAnimationProperty,
                          nsCSSProperty aProperty)
 {
   AnimationsOrTransitions* animations =
     static_cast<AnimationsOrTransitions*>(aContent->GetProperty(aAnimationProperty));
   if (animations) {
     bool propertyMatches = animations->HasAnimationOfProperty(aProperty);
     if (propertyMatches) {
       return animations;
     }
   }
 
   return nullptr;
 }
 
+template ElementAnimations*
+mozilla::HasAnimationOrTransition<ElementAnimations>(nsIContent* aContent,
+                         nsIAtom* aAnimationProperty,
+                         nsCSSProperty aProperty);
+
+template ElementTransitions*
+mozilla::HasAnimationOrTransition<ElementTransitions>(nsIContent* aContent,
+                         nsIAtom* aAnimationProperty,
+                         nsCSSProperty aProperty);
+
+
 bool
 nsLayoutUtils::HasAnimations(nsIContent* aContent,
                              nsCSSProperty aProperty)
 {
   if (!aContent->MayHaveAnimations())
     return false;
   return HasAnimationOrTransition<ElementAnimations>
             (aContent, nsGkAtoms::animationsProperty, aProperty) ||

--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -65,16 +65,22 @@ class DOMRectList;
 class Element;
 class HTMLImageElement;
 class HTMLCanvasElement;
 class HTMLVideoElement;
 } // namespace dom
 namespace layers {
 class Layer;
 }
+
+template <class AnimationsOrTransitions>
+extern AnimationsOrTransitions* HasAnimationOrTransition(nsIContent* aContent,
+                                                         nsIAtom* aAnimationProperty,
+                                                         nsCSSProperty aProperty);
+
 } // namespace mozilla
 
 /**
  * nsLayoutUtils is a namespace class used for various helper
  * functions that are useful in multiple places in layout.  The goal
  * is not to define multiple copies of the same static helper.
  */
 class nsLayoutUtils