Delete RenderLayerCompositor::m_compositingLayersNeedRebuild

This CL folds m_compositingLayersNeedRebuild into m_updateType, which lets us
remove a bunch of parallel bookkeeping.

BUG=332248

Review URL: https://codereview.chromium.org/320103005

git-svn-id: svn://svn.chromium.org/blink/trunk@175760 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

@@ -3213,7 +3213,7 @@ void HTMLMediaElement::didBecomeFullscreenElement()
     if (hasMediaControls())
         mediaControls()->enteredFullscreen();
     if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoElement(*this))
-        document().renderView()->compositor()->setCompositingLayersNeedRebuild();
+        document().renderView()->compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 void HTMLMediaElement::willStopBeingFullscreenElement()
@@ -3221,7 +3221,7 @@ void HTMLMediaElement::willStopBeingFullscreenElement()
     if (hasMediaControls())
         mediaControls()->exitedFullscreen();
     if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoElement(*this))
-        document().renderView()->compositor()->setCompositingLayersNeedRebuild();
+        document().renderView()->compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 blink::WebLayer* HTMLMediaElement::platformLayer() const

third_party/WebKit/Source/core/rendering/RenderLayerStackingNode.cpp

@@ -110,7 +110,7 @@ void RenderLayerStackingNode::dirtyZOrderLists()
     m_zOrderListsDirty = true;
 
     if (!renderer()->documentBeingDestroyed())
-        compositor()->setCompositingLayersNeedRebuild();
+        compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 void RenderLayerStackingNode::dirtyStackingContextZOrderLists()
@@ -132,7 +132,7 @@ void RenderLayerStackingNode::dirtyNormalFlowList()
     m_normalFlowListDirty = true;
 
     if (!renderer()->documentBeingDestroyed())
-        compositor()->setCompositingLayersNeedRebuild();
+        compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 void RenderLayerStackingNode::rebuildZOrderLists()

third_party/WebKit/Source/core/rendering/compositing/CompositingPropertyUpdater.h

@@ -33,7 +33,7 @@ public:
         ForceUpdate,
     };
 
-    void updateAncestorDependentProperties(RenderLayer*, UpdateType, AncestorInfo = AncestorInfo());
+    void updateAncestorDependentProperties(RenderLayer*, UpdateType = DoNotForceUpdate, AncestorInfo = AncestorInfo());
 
 #if !ASSERT_DISABLED
     static void assertNeedsToUpdateAncestorDependantPropertiesBitsCleared(RenderLayer*);

third_party/WebKit/Source/core/rendering/compositing/GraphicsLayerUpdater.h

@@ -59,7 +59,7 @@ public:
         ForceUpdate,
     };
 
-    void update(RenderLayer&, UpdateType, const UpdateContext& = UpdateContext());
+    void update(RenderLayer&, UpdateType = DoNotForceUpdate, const UpdateContext& = UpdateContext());
     void rebuildTree(RenderLayer&, GraphicsLayerVector& childLayersOfEnclosingLayer);
 
     bool needsRebuildTree() const { return m_needsRebuildTree; }

third_party/WebKit/Source/core/rendering/compositing/RenderLayerCompositor.cpp

@@ -89,7 +89,6 @@ RenderLayerCompositor::RenderLayerCompositor(RenderView& renderView)
     , m_pendingUpdateType(CompositingUpdateNone)
     , m_hasAcceleratedCompositing(true)
     , m_compositing(false)
-    , m_compositingLayersNeedRebuild(false)
     , m_rootShouldAlwaysCompositeDirty(true)
     , m_needsUpdateFixedBackground(false)
     , m_isTrackingRepaints(false)
@@ -153,18 +152,11 @@ void RenderLayerCompositor::enableCompositingModeIfNeeded()
     if (rootShouldAlwaysComposite()) {
         // FIXME: Is this needed? It was added in https://bugs.webkit.org/show_bug.cgi?id=26651.
         // No tests fail if it's deleted.
-        setCompositingLayersNeedRebuild();
+        setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
         setCompositingModeEnabled(true);
     }
 }
 
-bool RenderLayerCompositor::compositingLayersNeedRebuild()
-{
-    // enableCompositingModeIfNeeded can set the m_compositingLayersNeedRebuild bit.
-    ASSERT(!m_rootShouldAlwaysCompositeDirty);
-    return m_compositingLayersNeedRebuild;
-}
-
 bool RenderLayerCompositor::rootShouldAlwaysComposite() const
 {
     if (!m_hasAcceleratedCompositing)
@@ -175,15 +167,7 @@ bool RenderLayerCompositor::rootShouldAlwaysComposite() const
 void RenderLayerCompositor::updateAcceleratedCompositingSettings()
 {
     m_compositingReasonFinder.updateTriggers();
-
-    bool hasAcceleratedCompositing = m_renderView.document().settings()->acceleratedCompositingEnabled();
-
-    // FIXME: Is this needed? It was added in https://bugs.webkit.org/show_bug.cgi?id=26651.
-    // No tests fail if it's deleted.
-    if (hasAcceleratedCompositing != m_hasAcceleratedCompositing)
-        setCompositingLayersNeedRebuild();
-
-    m_hasAcceleratedCompositing = hasAcceleratedCompositing;
+    m_hasAcceleratedCompositing = m_renderView.document().settings()->acceleratedCompositingEnabled();
     m_rootShouldAlwaysCompositeDirty = true;
 }
 
@@ -201,14 +185,6 @@ bool RenderLayerCompositor::acceleratedCompositingForOverflowScrollEnabled() con
     return m_compositingReasonFinder.hasOverflowScrollTrigger();
 }
 
-void RenderLayerCompositor::setCompositingLayersNeedRebuild()
-{
-    // FIXME: crbug.com/332248 ideally this could be merged with setNeedsCompositingUpdate().
-    m_compositingLayersNeedRebuild = true;
-    page()->animator().scheduleVisualUpdate();
-    lifecycle().ensureStateAtMost(DocumentLifecycle::LayoutClean);
-}
-
 static RenderVideo* findFullscreenVideoRenderer(Document& document)
 {
     Element* fullscreenElement = FullscreenElementStack::fullscreenElementFrom(document);
@@ -292,7 +268,6 @@ void RenderLayerCompositor::didLayout()
 
 void RenderLayerCompositor::assertNoUnresolvedDirtyBits()
 {
-    ASSERT(!compositingLayersNeedRebuild());
     ASSERT(m_pendingUpdateType == CompositingUpdateNone);
     ASSERT(!m_rootShouldAlwaysCompositeDirty);
 }
@@ -339,27 +314,21 @@ void RenderLayerCompositor::updateIfNeeded()
         // before moving this function after checking the dirty bits.
         DeprecatedDirtyCompositingDuringCompositingUpdate marker(lifecycle());
 
-        // FIXME: enableCompositingModeIfNeeded can call setCompositingLayersNeedRebuild,
+        // FIXME: enableCompositingModeIfNeeded can trigger a CompositingUpdateRebuildTree,
         // which asserts that it's not InCompositingUpdate.
         enableCompositingModeIfNeeded();
     }
 
     CompositingUpdateType updateType = m_pendingUpdateType;
-    bool needHierarchyAndGeometryUpdate = compositingLayersNeedRebuild();
-
     m_pendingUpdateType = CompositingUpdateNone;
-    m_compositingLayersNeedRebuild = false;
 
     if (!hasAcceleratedCompositing())
         return;
 
     bool needsToUpdateScrollingCoordinator = scrollingCoordinator() && scrollingCoordinator()->needsToUpdateAfterCompositingChange();
-    if (updateType == CompositingUpdateNone && !needHierarchyAndGeometryUpdate && !needsToUpdateScrollingCoordinator)
+    if (updateType == CompositingUpdateNone && !needsToUpdateScrollingCoordinator)
         return;
 
-    GraphicsLayerUpdater::UpdateType graphicsLayerUpdateType = GraphicsLayerUpdater::DoNotForceUpdate;
-    CompositingPropertyUpdater::UpdateType compositingPropertyUpdateType = CompositingPropertyUpdater::DoNotForceUpdate;
-
     RenderLayer* updateRoot = rootRenderLayer();
 
     Vector<RenderLayer*> layersNeedingRepaint;
@@ -368,7 +337,7 @@ void RenderLayerCompositor::updateIfNeeded()
         bool layersChanged = false;
         {
             TRACE_EVENT0("blink_rendering", "CompositingPropertyUpdater::updateAncestorDependentProperties");
-            CompositingPropertyUpdater(updateRoot).updateAncestorDependentProperties(updateRoot, compositingPropertyUpdateType);
+            CompositingPropertyUpdater(updateRoot).updateAncestorDependentProperties(updateRoot);
 #if ASSERT_ENABLED
             CompositingPropertyUpdater::assertNeedsToUpdateAncestorDependantPropertiesBitsCleared(updateRoot);
 #endif
@@ -390,16 +359,16 @@ void RenderLayerCompositor::updateIfNeeded()
         }
 
         if (layersChanged)
-            needHierarchyAndGeometryUpdate = true;
+            updateType = std::max(updateType, CompositingUpdateRebuildTree);
     }
 
-    if (updateType != CompositingUpdateNone || needHierarchyAndGeometryUpdate) {
+    if (updateType != CompositingUpdateNone) {
         TRACE_EVENT0("blink_rendering", "GraphicsLayerUpdater::updateRecursive");
         GraphicsLayerUpdater updater;
-        updater.update(*updateRoot, graphicsLayerUpdateType);
+        updater.update(*updateRoot);
 
         if (updater.needsRebuildTree())
-            needHierarchyAndGeometryUpdate = true;
+            updateType = std::max(updateType, CompositingUpdateRebuildTree);
 
 #if !ASSERT_DISABLED
         // FIXME: Move this check to the end of the compositing update.
@@ -407,8 +376,7 @@ void RenderLayerCompositor::updateIfNeeded()
 #endif
     }
 
-    if (needHierarchyAndGeometryUpdate) {
-        // Update the hierarchy of the compositing layers.
+    if (updateType >= CompositingUpdateRebuildTree) {
         GraphicsLayerVector childList;
         {
             TRACE_EVENT0("blink_rendering", "GraphicsLayerTreeBuilder::rebuild");
@@ -429,8 +397,6 @@ void RenderLayerCompositor::updateIfNeeded()
         m_needsUpdateFixedBackground = false;
     }
 
-    ASSERT(updateRoot || !compositingLayersNeedRebuild());
-
     // The scrolling coordinator may realize that it needs updating while compositing was being updated in this function.
     needsToUpdateScrollingCoordinator |= scrollingCoordinator() && scrollingCoordinator()->needsToUpdateAfterCompositingChange();
     if (needsToUpdateScrollingCoordinator && m_renderView.frame()->isMainFrame() && scrollingCoordinator() && inCompositingMode())
@@ -555,7 +521,7 @@ void RenderLayerCompositor::updateLayerCompositingState(RenderLayer* layer, Upda
     CompositingStateTransitionType compositedLayerUpdate = CompositingLayerAssigner(this).computeCompositedLayerUpdate(layer);
 
     if (compositedLayerUpdate != NoCompositingStateChange)
-        setCompositingLayersNeedRebuild();
+        setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 
     if (options == UseChickenEggHacks)
         applyUpdateLayerCompositingStateChickenEggHacks(layer, compositedLayerUpdate);
@@ -587,7 +553,7 @@ void RenderLayerCompositor::repaintInCompositedAncestor(RenderLayer* layer, cons
 
 void RenderLayerCompositor::layerWasAdded(RenderLayer* /*parent*/, RenderLayer* /*child*/)
 {
-    setCompositingLayersNeedRebuild();
+    setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 void RenderLayerCompositor::layerWillBeRemoved(RenderLayer* parent, RenderLayer* child)
@@ -602,7 +568,7 @@ void RenderLayerCompositor::layerWillBeRemoved(RenderLayer* parent, RenderLayer*
         repaintInCompositedAncestor(child, child->compositedLayerMapping()->compositedBounds());
     }
 
-    setCompositingLayersNeedRebuild();
+    setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 void RenderLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsOffset)

third_party/WebKit/Source/core/rendering/compositing/RenderLayerCompositor.h

@@ -49,6 +49,7 @@ enum CompositingUpdateType {
     CompositingUpdateNone,
     CompositingUpdateOnCompositedScroll,
     CompositingUpdateAfterCompositingInputChange,
+    CompositingUpdateRebuildTree,
 };
 
 enum CompositingStateTransitionType {
@@ -94,10 +95,6 @@ public:
     // Copy the accelerated compositing related flags from Settings
     void updateAcceleratedCompositingSettings();
 
-    // Called when the layer hierarchy needs to be updated (compositing layers have been
-    // created, destroyed or re-parented).
-    void setCompositingLayersNeedRebuild();
-
     // Used to indicate that a compositing update will be needed for the next frame that gets drawn.
     void setNeedsCompositingUpdate(CompositingUpdateType);
 
@@ -234,8 +231,6 @@ private:
     GraphicsLayerFactory* graphicsLayerFactory() const;
     ScrollingCoordinator* scrollingCoordinator() const;
 
-    bool compositingLayersNeedRebuild();
-
     void enableCompositingModeIfNeeded();
 
     bool requiresHorizontalScrollbarLayer() const;
@@ -261,7 +256,6 @@ private:
 
     bool m_hasAcceleratedCompositing;
     bool m_compositing;
-    bool m_compositingLayersNeedRebuild;
 
     // The root layer doesn't composite if it's a non-scrollable frame.
     // So, after a layout we set this dirty bit to know that we need