From e8f21d7215708135ffc3bd356827afc058066d26 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hiikezoe@mozilla-japan.org>
Date: Fri, 6 Nov 2015 02:35:00 +0100
Subject: [PATCH] Bug 1216030 - Part 4: Move
 IsCompositorAnimationDisabledForFrame outside animation properties loop.
 r=dbaron

---
 layout/style/AnimationCommon.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/layout/style/AnimationCommon.cpp b/layout/style/AnimationCommon.cpp
index 22814033a29e..5e25b3b85e5a 100644
--- a/layout/style/AnimationCommon.cpp
+++ b/layout/style/AnimationCommon.cpp
@@ -526,6 +526,10 @@ AnimationCollection::CanPerformOnCompositorThread(
     return false;
   }
 
+  if (IsCompositorAnimationDisabledForFrame(frame)) {
+    return false;
+  }
+
   bool existsProperty = false;
   for (size_t animIdx = mAnimations.Length(); animIdx-- != 0; ) {
     const Animation* anim = mAnimations[animIdx];
@@ -543,8 +547,7 @@ AnimationCollection::CanPerformOnCompositorThread(
       const AnimationProperty& prop = effect->Properties()[propIdx];
       if (!CanAnimatePropertyOnCompositor(element,
                                           prop.mProperty,
-                                          aFlags) ||
-          IsCompositorAnimationDisabledForFrame(frame)) {
+                                          aFlags)) {
         return false;
       }
     }