Delete DeprecatedDirtyCompositingDuringCompositingUpdate

Source/core/rendering/compositing/RenderLayerCompositor.cpp

 /*
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 39 matching lines @@
 #include "core/rendering/compositing/CompositingRequirementsUpdater.h"
 #include "core/rendering/compositing/GraphicsLayerTreeBuilder.h"
 #include "core/rendering/compositing/GraphicsLayerUpdater.h"
 #include "platform/OverscrollTheme.h"
 #include "platform/TraceEvent.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "public/platform/Platform.h"
 
 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)
     , m_pendingUpdateType(CompositingUpdateNone)
     , m_hasAcceleratedCompositing(true)
     , m_compositing(false)
     , m_rootShouldAlwaysCompositeDirty(true)
     , m_needsUpdateFixedBackground(false)
     , m_isTrackingRepaints(false)
     , m_rootLayerAttachment(RootLayerUnattached)
@@ skipping 112 matching lines @@
         if (child->isLocalFrame())
             toLocalFrame(child)->contentRenderer()->compositor()->updateIfNeededRecursive();
     }
 
     TRACE_EVENT0("blink_rendering", "RenderLayerCompositor::updateIfNeededRecursive");
 
     ASSERT(!m_renderView.needsLayout());
 
     ScriptForbiddenScope forbidScript;
 
+    // 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());
     // TODO: Figure out why this fails on Chrome OS login page. crbug.com/365507
     // ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean);
 
 #if ASSERT_ENABLED
     assertNoUnresolvedDirtyBits();
     for (Frame* child = m_renderView.frameView()->frame().tree().firstChild(); child; child = child->tree().nextSibling()) {
         if (child->isLocalFrame())
@@ skipping 73 matching lines @@
         return;
 
     m_rootContentLayer->removeAllChildren();
     m_overflowControlsHostLayer->addChild(videoLayer);
     if (GraphicsLayer* backgroundLayer = fixedRootBackgroundLayer())
         backgroundLayer->removeFromParent();
 }
 
 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;
 
     if (!hasAcceleratedCompositing())
         return;
 
     bool needsToUpdateScrollingCoordinator = scrollingCoordinator() && scrollingCoordinator()->needsToUpdateAfterCompositingChange();
     if (updateType == CompositingUpdateNone && !needsToUpdateScrollingCoordinator)
         return;
 
@@ skipping 957 matching lines @@
     } else if (graphicsLayer == m_scrollLayer.get()) {
         name = "LocalFrame Scrolling Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace WebCore