Defer updateCompositingRequirementsState until the compositing update

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 340 matching lines @@
 bool RenderLayerCompositor::hasUnresolvedDirtyBits()
 {
     return m_needsToRecomputeCompositingRequirements || m_compositingLayersNeedRebuild || m_needsUpdateCompositingRequirementsState || m_pendingUpdateType > CompositingUpdateNone;
 }
 
 void RenderLayerCompositor::updateIfNeeded()
 {
     if (m_forceCompositingMode && !m_compositing)
         enableCompositingMode(true);
 
+    {
+        // 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());
+        updateCompositingRequirementsState();
+    }
+
     if (!m_needsToRecomputeCompositingRequirements && !m_compositing)
         return;
 
     CompositingUpdateType updateType = m_pendingUpdateType;
 
     bool needCompositingRequirementsUpdate = m_needsToRecomputeCompositingRequirements;
     bool needHierarchyAndGeometryUpdate = m_compositingLayersNeedRebuild;
     bool needsToUpdateScrollingCoordinator = scrollingCoordinator() ? scrollingCoordinator()->needsToUpdateAfterCompositingChange() : false;
 
     if (updateType == CompositingUpdateNone && !needCompositingRequirementsUpdate && !needHierarchyAndGeometryUpdate && !needsToUpdateScrollingCoordinator)
@@ skipping 1341 matching lines @@
     } else if (graphicsLayer == m_scrollLayer.get()) {
         name = "LocalFrame Scrolling Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace WebCore