Revert of Delete CompositingUpdateAfterLayout

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 238 matching lines @@
 #if ASSERT_ENABLED
     assertNoUnresolvedDirtyBits();
     for (LocalFrame* child = m_renderView.frameView()->frame().tree().firstChild(); child; child = child->tree().nextSibling())
         child->contentRenderer()->compositor()->assertNoUnresolvedDirtyBits();
 #endif
 }
 
 void RenderLayerCompositor::setNeedsCompositingUpdate(CompositingUpdateType updateType)
 {
     ASSERT(updateType != CompositingUpdateNone);
+    // FIXME: Technically we only need to do this when the FrameView's isScrollable method
+    // would return a different value.
+    if (updateType == CompositingUpdateAfterLayout)
+        m_rootShouldAlwaysCompositeDirty = true;
+
+    // FIXME: This function should only set dirty bits. We shouldn't
+    // enable compositing mode here.
+    // We check needsLayout here because we don't know if we need to enable
+    // compositing mode until layout is up-to-date because we need to know
+    // if this frame scrolls.
+    if (!m_renderView.needsLayout())
+        enableCompositingModeIfNeeded();
+
     m_pendingUpdateType = std::max(m_pendingUpdateType, updateType);
+
     page()->animator().scheduleVisualUpdate();
     lifecycle().ensureStateAtMost(DocumentLifecycle::LayoutClean);
 }
 
-void RenderLayerCompositor::didLayout()
-{
-    // FIXME: Technically we only need to do this when the FrameView's
-    // isScrollable method would return a different value.
-    m_rootShouldAlwaysCompositeDirty = true;
-    enableCompositingModeIfNeeded();
-
-    // FIXME: Rather than marking the entire RenderView as dirty, we should
-    // track which RenderLayers moved during layout and only dirty those
-    // specific RenderLayers.
-    rootRenderLayer()->setNeedsToUpdateAncestorDependentProperties();
-    setNeedsCompositingUpdate(CompositingUpdateAfterCompositingInputChange);
-}
-
 #if ASSERT_ENABLED
 
 void RenderLayerCompositor::assertNoUnresolvedDirtyBits()
 {
     ASSERT(!compositingLayersNeedRebuild());
     ASSERT(m_pendingUpdateType == CompositingUpdateNone);
     ASSERT(!m_rootShouldAlwaysCompositeDirty);
 }
 
 #endif
@@ skipping 52 matching lines @@
     if (!hasAcceleratedCompositing())
         return;
 
     bool needsToUpdateScrollingCoordinator = scrollingCoordinator() && scrollingCoordinator()->needsToUpdateAfterCompositingChange();
     if (updateType == CompositingUpdateNone && !needHierarchyAndGeometryUpdate && !needsToUpdateScrollingCoordinator)
         return;
 
     GraphicsLayerUpdater::UpdateType graphicsLayerUpdateType = GraphicsLayerUpdater::DoNotForceUpdate;
     CompositingPropertyUpdater::UpdateType compositingPropertyUpdateType = CompositingPropertyUpdater::DoNotForceUpdate;
 
+    // FIXME: Teach non-style compositing updates how to do partial tree walks.
+    if (updateType >= CompositingUpdateAfterLayout) {
+        graphicsLayerUpdateType = GraphicsLayerUpdater::ForceUpdate;
+        compositingPropertyUpdateType = CompositingPropertyUpdater::ForceUpdate;
+    }
+
     RenderLayer* updateRoot = rootRenderLayer();
 
     Vector<RenderLayer*> layersNeedingRepaint;
 
     if (updateType >= CompositingUpdateAfterCompositingInputChange) {
         bool layersChanged = false;
         {
             TRACE_EVENT0("blink_rendering", "CompositingPropertyUpdater::updateAncestorDependentProperties");
             CompositingPropertyUpdater(updateRoot).updateAncestorDependentProperties(updateRoot, compositingPropertyUpdateType);
 #if ASSERT_ENABLED
@@ skipping 970 matching lines @@
     } else if (graphicsLayer == m_scrollLayer.get()) {
         name = "LocalFrame Scrolling Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace WebCore