Delete DeprecatedDirtyCompositingDuringCompositingUpdate

Source/core/rendering/compositing/RenderLayerCompositor.cpp

Index: Source/core/rendering/compositing/RenderLayerCompositor.cpp
diff --git a/Source/core/rendering/compositing/RenderLayerCompositor.cpp b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
index ee9683c4ea02041fd5fda599ce5046935749a1a3..d4fab7723c1051b906d53c92c08299e1c91fdc01 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -57,34 +57,6 @@
 
 namespace WebCore {
 
-class DeprecatedDirtyCompositingDuringCompositingUpdate {
-    WTF_MAKE_NONCOPYABLE(DeprecatedDirtyCompositingDuringCompositingUpdate);
-public:
-    DeprecatedDirtyCompositingDuringCompositingUpdate(DocumentLifecycle& lifecycle)
-        : m_lifecycle(lifecycle)
-        , m_deprecatedTransition(lifecycle.state(), DocumentLifecycle::LayoutClean)
-        , m_originalState(lifecycle.state())
-    {
-    }
-
-    ~DeprecatedDirtyCompositingDuringCompositingUpdate()
-    {
-        if (m_originalState != DocumentLifecycle::InCompositingUpdate)
-            return;
-        if (m_lifecycle.state() != m_originalState) {
-            // FIXME: It's crazy that we can trigger a style recalc from inside
-            // the compositing update, but that happens in compositing/visibility/hidden-iframe.html.
-            ASSERT(m_lifecycle.state() == DocumentLifecycle::LayoutClean || m_lifecycle.state() == DocumentLifecycle::VisualUpdatePending);
-            m_lifecycle.advanceTo(m_originalState);
-        }
-    }
-
-private:
-    DocumentLifecycle& m_lifecycle;
-    DocumentLifecycle::DeprecatedTransition m_deprecatedTransition;
-    DocumentLifecycle::State m_originalState;
-};
-
 RenderLayerCompositor::RenderLayerCompositor(RenderView& renderView)
     : m_renderView(renderView)
     , m_compositingReasonFinder(renderView)
@@ -217,10 +189,12 @@ void RenderLayerCompositor::updateIfNeededRecursive()
 
     ScriptForbiddenScope forbidScript;
 
-    lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate);
+    // FIXME: enableCompositingModeIfNeeded can trigger a CompositingUpdateRebuildTree,
+    // which asserts that it's not InCompositingUpdate.
+    enableCompositingModeIfNeeded();

[ojan, 2014/06/11 18:44:47]

Incidentally, if we were to continue to invest in fixing the compositing code, I
think this call should go away entirely. We should only enable composting mode
when we allocate the root compositing layer. Right now we enable it only to
disable it later in some edge cases. That's both silly and means that anywhere
we query the m_compositing bit is getting an incorrect value.

I think we're pretty close to deleting this line now. I've gotten rid of most of
the m_compositing checks. We just need to make sure nothing under updateIfNeeded
queries m_compositing before the stage where we allocate the root compositing
layer.

 
+    lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate);
     updateIfNeeded();
-
     lifecycle().advanceTo(DocumentLifecycle::CompositingClean);
 
     DocumentAnimations::startPendingAnimations(m_renderView.document());
@@ -314,17 +288,6 @@ void RenderLayerCompositor::applyOverlayFullscreenVideoAdjustment()
 
 void RenderLayerCompositor::updateIfNeeded()
 {
-    {
-        // FIXME: Notice that we call this function before checking the dirty bits below.
-        // We'll need to remove DeprecatedDirtyCompositingDuringCompositingUpdate
-        // before moving this function after checking the dirty bits.
-        DeprecatedDirtyCompositingDuringCompositingUpdate marker(lifecycle());
-
-        // FIXME: enableCompositingModeIfNeeded can trigger a CompositingUpdateRebuildTree,
-        // which asserts that it's not InCompositingUpdate.
-        enableCompositingModeIfNeeded();
-    }
-
     CompositingUpdateType updateType = m_pendingUpdateType;
     m_pendingUpdateType = CompositingUpdateNone;