Defer updateCompositingRequirementsState until the compositing update

Source/core/frame/FrameView.cpp

Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index ecd94c3c44fbe8ac15a79a434ff092e09039e327..eb0a4867fa4baaa820e082deaebe5d11ce6f1cf2 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -627,12 +627,6 @@ void FrameView::updateCompositingLayersAfterStyleChange()
     // https://code.google.com/p/chromium/issues/detail?id=343756
     DisableCompositingQueryAsserts disabler;
 
-    // Sometimes we will change a property (for example, z-index) that will not
-    // cause a layout, but will require us to update compositing state. We only
-    // need to do this if a layout is not already scheduled.
-    if (!needsLayout())
-        renderView->compositor()->updateCompositingRequirementsState();
-
     renderView->compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterStyleChange);
 }
 
@@ -648,7 +642,6 @@ void FrameView::updateCompositingLayersAfterLayout()
     DisableCompositingQueryAsserts disabler;
 
     renderView->compositor()->updateForceCompositingMode();
-    renderView->compositor()->updateCompositingRequirementsState();
     renderView->compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterLayout);
 }