Hoist compositorDrivenAcceleratedScrollingEnabled check out of scrollParent

Source/core/rendering/compositing/CompositingReasonFinder.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/rendering/compositing/CompositingReasonFinder.h"
 
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
 #include "core/animation/ActiveAnimations.h"
@@ skipping 41 matching lines @@
 {
     return m_compositingTriggers & AnimationTrigger;
 }
 
 bool CompositingReasonFinder::isMainFrame() const
 {
     // FIXME: LocalFrame::isMainFrame() is probably better.
     return !m_renderView.document().ownerElement();
 }
 
-CompositingReasons CompositingReasonFinder::styleDeterminedReasons(RenderObject* renderer) const
-{
-    CompositingReasons directReasons = CompositingReasonNone;
-
-    if (requiresCompositingForTransform(renderer))
-        directReasons |= CompositingReason3DTransform;
-
-    if (requiresCompositingForBackfaceVisibilityHidden(renderer))
-        directReasons |= CompositingReasonBackfaceVisibilityHidden;
-
-    if (requiresCompositingForFilters(renderer))
-        directReasons |= CompositingReasonFilters;
-
-    if (requiresCompositingForWillChange(renderer))
-        directReasons |= CompositingReasonWillChange;
-
-    ASSERT(!(directReasons & ~CompositingReasonComboAllStyleDeterminedReasons));
-    return directReasons;
-}
-
-CompositingReasons CompositingReasonFinder::nonStyleDeterminedDirectReasons(const RenderLayer* layer, bool* needToRecomputeCompositingRequirements) const
-{
-    CompositingReasons directReasons = CompositingReasonNone;
-    RenderObject* renderer = layer->renderer();
-
-    if (requiresCompositingForAnimation(renderer))
-        directReasons |= CompositingReasonActiveAnimation;
-
-    if (requiresCompositingForOutOfFlowClipping(layer))
-        directReasons |= CompositingReasonOutOfFlowClipping;
-
-    if (requiresCompositingForOverflowScrolling(layer))
-        directReasons |= CompositingReasonOverflowScrollingTouch;
-
-    if (requiresCompositingForOverflowScrollingParent(layer))
-        directReasons |= CompositingReasonOverflowScrollingParent;
-
-    if (requiresCompositingForPosition(renderer, layer, 0, needToRecomputeCompositingRequirements))
-        directReasons |= renderer->style()->position() == FixedPosition ? CompositingReasonPositionFixed : CompositingReasonPositionSticky;
-
-    directReasons |= renderer->additionalCompositingReasons(m_compositingTriggers);
-
-    ASSERT(!(directReasons & CompositingReasonComboAllStyleDeterminedReasons));
-    return directReasons;
-}
-
 CompositingReasons CompositingReasonFinder::directReasons(const RenderLayer* layer, bool* needToRecomputeCompositingRequirements) const
 {
     CompositingReasons styleReasons = layer->styleDeterminedCompositingReasons();
     ASSERT(styleDeterminedReasons(layer->renderer()) == styleReasons);
     return styleReasons | nonStyleDeterminedDirectReasons(layer, needToRecomputeCompositingRequirements);
 }
 
+// This information doesn't appear to be incorporated into CompositingReasons.
 bool CompositingReasonFinder::requiresCompositingForScrollableFrame() const
 {
     // Need this done first to determine overflow.
     ASSERT(!m_renderView.needsLayout());
     if (isMainFrame())
         return false;
 
     if (!(m_compositingTriggers & ScrollableInnerFrameTrigger))
         return false;
 
     FrameView* frameView = m_renderView.frameView();
     return frameView->isScrollable();
 }
 
+CompositingReasons CompositingReasonFinder::styleDeterminedReasons(RenderObject* renderer) const
+{
+    CompositingReasons directReasons = CompositingReasonNone;
+
+    if (requiresCompositingForTransform(renderer))
+        directReasons |= CompositingReason3DTransform;
+
+    if (requiresCompositingForBackfaceVisibilityHidden(renderer))
+        directReasons |= CompositingReasonBackfaceVisibilityHidden;
+
+    if (requiresCompositingForFilters(renderer))
+        directReasons |= CompositingReasonFilters;
+
+    if (requiresCompositingForWillChange(renderer))
+        directReasons |= CompositingReasonWillChange;
+
+    ASSERT(!(directReasons & ~CompositingReasonComboAllStyleDeterminedReasons));
+    return directReasons;
+}
+
 bool CompositingReasonFinder::requiresCompositingForTransform(RenderObject* renderer) const
 {
     if (!(m_compositingTriggers & ThreeDTransformTrigger))
         return false;
 
-    RenderStyle* style = renderer->style();
     // Note that we ask the renderer if it has a transform, because the style may have transforms,
     // but the renderer may be an inline that doesn't suppport them.
-    return renderer->hasTransform() && style->transform().has3DOperation();
+    return renderer->hasTransform() && renderer->style()->transform().has3DOperation();
 }
 
 bool CompositingReasonFinder::requiresCompositingForBackfaceVisibilityHidden(RenderObject* renderer) const
 {
     if (!(m_compositingTriggers & ThreeDTransformTrigger))
         return false;
 
     return renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden;
 }
 
-bool CompositingReasonFinder::requiresCompositingForAnimation(RenderObject* renderer) const
-{
-    if (!(m_compositingTriggers & AnimationTrigger))
-        return false;
-
-    return shouldCompositeForActiveAnimations(*renderer);
-}
-
 bool CompositingReasonFinder::requiresCompositingForFilters(RenderObject* renderer) const
 {
     if (!(m_compositingTriggers & FilterTrigger))
         return false;
 
     return renderer->hasFilter();
 }
 
-bool CompositingReasonFinder::requiresCompositingForOverflowScrollingParent(const RenderLayer* layer) const
-{
-    return !!layer->scrollParent();
-}
-
-bool CompositingReasonFinder::requiresCompositingForOutOfFlowClipping(const RenderLayer* layer) const
-{
-    return m_renderView.compositorDrivenAcceleratedScrollingEnabled() && layer->isUnclippedDescendant();
-}
-
 bool CompositingReasonFinder::requiresCompositingForWillChange(const RenderObject* renderer) const
 {
     if (renderer->style()->hasWillChangeCompositingHint())
         return true;
 
     if (!(m_compositingTriggers & GPURasterizationTrigger))
         return false;
 
     return renderer->style()->hasWillChangeGpuRasterizationHint();
 }
 
+CompositingReasons CompositingReasonFinder::nonStyleDeterminedDirectReasons(const RenderLayer* layer, bool* needToRecomputeCompositingRequirements) const
+{
+    CompositingReasons directReasons = CompositingReasonNone;
+    RenderObject* renderer = layer->renderer();
+
+    if (requiresCompositingForAnimation(renderer))
+        directReasons |= CompositingReasonActiveAnimation;
+
+    if (m_renderView.compositorDrivenAcceleratedScrollingEnabled()) {
+        if (requiresCompositingForOutOfFlowClipping(layer))
+            directReasons |= CompositingReasonOutOfFlowClipping;
+
+        if (requiresCompositingForOverflowScrollingParent(layer))
+            directReasons |= CompositingReasonOverflowScrollingParent;
+    }
+
+    if (requiresCompositingForOverflowScrolling(layer))
+        directReasons |= CompositingReasonOverflowScrollingTouch;
+
+    if (requiresCompositingForPosition(renderer, layer, 0, needToRecomputeCompositingRequirements))
+        directReasons |= renderer->style()->position() == FixedPosition ? CompositingReasonPositionFixed : CompositingReasonPositionSticky;
+
+    directReasons |= renderer->additionalCompositingReasons(m_compositingTriggers);
+
+    ASSERT(!(directReasons & CompositingReasonComboAllStyleDeterminedReasons));
+    return directReasons;
+}
+
+bool CompositingReasonFinder::requiresCompositingForAnimation(RenderObject* renderer) const
+{
+    if (!(m_compositingTriggers & AnimationTrigger))
+        return false;
+
+    return shouldCompositeForActiveAnimations(*renderer);
+}
+
+bool CompositingReasonFinder::requiresCompositingForOutOfFlowClipping(const RenderLayer* layer) const
+{
+    return layer->isUnclippedDescendant();
+}
+
+bool CompositingReasonFinder::requiresCompositingForOverflowScrollingParent(const RenderLayer* layer) const
+{
+    return layer->scrollParent();
+}
+
+bool CompositingReasonFinder::requiresCompositingForOverflowScrolling(const RenderLayer* layer) const
+{
+    return layer->needsCompositedScrolling();
+}
+
 bool CompositingReasonFinder::isViewportConstrainedFixedOrStickyLayer(const RenderLayer* layer)
 {
     if (layer->renderer()->isStickyPositioned())
         return !layer->enclosingOverflowClipLayer(ExcludeSelf);
 
     if (layer->renderer()->style()->position() != FixedPosition)
         return false;
 
     for (const RenderLayerStackingNode* stackingContainer = layer->stackingNode(); stackingContainer;
         stackingContainer = stackingContainer->ancestorStackingContainerNode()) {
@@ skipping 100 matching lines @@
                 *viewportConstrainedNotCompositedReason = RenderLayer::NotCompositedForBoundsOutOfView;
                 *needToRecomputeCompositingRequirements = true;
             }
             return false;
         }
     }
 
     return true;
 }
 
-bool CompositingReasonFinder::requiresCompositingForOverflowScrolling(const RenderLayer* layer) const
-{
-    return layer->needsCompositedScrolling();
 }
-
-}