Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderLayerStackingNode.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderLayerStackingNode.cpp b/src/third_party/WebKit/Source/core/rendering/RenderLayerStackingNode.cpp
index 8a1bdda..071891f 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderLayerStackingNode.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderLayerStackingNode.cpp
@@ -60,7 +60,6 @@ RenderLayerStackingNode::RenderLayerStackingNode(RenderLayer* layer)
     , m_descendantsAreContiguousInStackingOrderDirty(true)
     , m_normalFlowListDirty(true)
     , m_needsToBeStackingContainer(false)
-    , m_needsToBeStackingContainerHasBeenRecorded(false)
 #if !ASSERT_DISABLED
     , m_layerListMutationAllowed(true)
     , m_stackingParent(0)
@@ -149,7 +148,7 @@ void RenderLayerStackingNode::dirtyZOrderLists()
     if (!renderer()->documentBeingDestroyed()) {
         compositor()->setNeedsUpdateCompositingRequirementsState();
         compositor()->setCompositingLayersNeedRebuild();
-        if (renderer()->acceleratedCompositingForOverflowScrollEnabled())
+        if (compositor()->legacyOrCurrentAcceleratedCompositingForOverflowScrollEnabled())
             compositor()->setNeedsToRecomputeCompositingRequirements();
     }
 }
@@ -190,7 +189,7 @@ void RenderLayerStackingNode::dirtyNormalFlowList()
 
     if (!renderer()->documentBeingDestroyed()) {
         compositor()->setCompositingLayersNeedRebuild();
-        if (renderer()->acceleratedCompositingForOverflowScrollEnabled())
+        if (compositor()->legacyOrCurrentAcceleratedCompositingForOverflowScrollEnabled())
             compositor()->setNeedsToRecomputeCompositingRequirements();
     }
 }
@@ -283,7 +282,7 @@ void RenderLayerStackingNode::collectLayers(OwnPtr<Vector<RenderLayerStackingNod
             isNormalFlow = false;
         } else {
             isStacking = isStackingContext();
-            isNormalFlow = shouldBeNormalFlowOnlyIgnoringCompositedScrolling();
+            isNormalFlow = shouldBeNormalFlowOnly();
         }
         break;
     case OverflowScrollCanBeStackingContainers:
@@ -293,7 +292,7 @@ void RenderLayerStackingNode::collectLayers(OwnPtr<Vector<RenderLayerStackingNod
         break;
     case OnlyStackingContextsCanBeStackingContainers:
         isStacking = isStackingContext();
-        isNormalFlow = shouldBeNormalFlowOnlyIgnoringCompositedScrolling();
+        isNormalFlow = shouldBeNormalFlowOnly();
         break;
     }
 
@@ -403,11 +402,6 @@ void RenderLayerStackingNode::updateStackingNodesAfterStyleChange(const RenderSt
 
 bool RenderLayerStackingNode::shouldBeNormalFlowOnly() const
 {
-    return shouldBeNormalFlowOnlyIgnoringCompositedScrolling() && !layer()->needsCompositedScrolling();
-}
-
-bool RenderLayerStackingNode::shouldBeNormalFlowOnlyIgnoringCompositedScrolling() const
-{
     const bool couldBeNormalFlow = renderer()->hasOverflowClip()
         || renderer()->hasReflection()
         || renderer()->hasMask()
@@ -451,7 +445,7 @@ void RenderLayerStackingNode::updateDescendantsAreContiguousInStackingOrder()
 {
     TRACE_EVENT0("blink_rendering,comp-scroll", "RenderLayerStackingNode::updateDescendantsAreContiguousInStackingOrder");
 
-    if (isStackingContext() || !m_descendantsAreContiguousInStackingOrderDirty || !renderer()->acceleratedCompositingForOverflowScrollEnabled())
+    if (isStackingContext() || !m_descendantsAreContiguousInStackingOrderDirty || !compositor()->legacyAcceleratedCompositingForOverflowScrollEnabled())
         return;
 
     if (!layer()->scrollsOverflow())
@@ -613,16 +607,7 @@ bool RenderLayerStackingNode::setNeedsToBeStackingContainer(bool needsToBeStacki
     if (this->needsToBeStackingContainer() == needsToBeStackingContainer)
         return false;
 
-    // Count the total number of RenderLayers which need to be stacking
-    // containers some point. This should be recorded at most once per
-    // RenderLayer, so we check m_needsToBeStackingContainerHasBeenRecorded.
-    if (renderer()->acceleratedCompositingForOverflowScrollEnabled() && !m_needsToBeStackingContainerHasBeenRecorded) {
-        blink::Platform::current()->histogramEnumeration("Renderer.CompositedScrolling", NeedsToBeStackingContainerBucket, CompositedScrollingHistogramMax);
-        m_needsToBeStackingContainerHasBeenRecorded = true;
-    }
-
     m_needsToBeStackingContainer = needsToBeStackingContainer;
-
     return true;
 }