Merge 159961 "Defer the real work in updateCompositingLayers unt..."

Source/web/PageWidgetDelegate.cpp

Index: Source/web/PageWidgetDelegate.cpp
===================================================================
--- Source/web/PageWidgetDelegate.cpp	(revision 159992)
+++ Source/web/PageWidgetDelegate.cpp	(working copy)
@@ -38,6 +38,8 @@
 #include "core/frame/Frame.h"
 #include "core/frame/FrameView.h"
 #include "core/platform/graphics/GraphicsContext.h"
+#include "core/rendering/RenderLayerCompositor.h"
+#include "core/rendering/RenderView.h"
 #include "wtf/CurrentTime.h"
 
 using namespace WebCore;
@@ -78,6 +80,11 @@
     // setFrameRect may have the side-effect of causing existing page layout to
     // be invalidated, so layout needs to be called last.
     view->updateLayoutAndStyleIfNeededRecursive();
+
+    // For now, as we know this is the point in code where the compositor has
+    // actually asked for Blink to update the composited layer tree. So finally
+    // do all the deferred work for updateCompositingLayers() here.
+    view->renderView()->compositor()->updateCompositingLayers(CompositingUpdateFinishAllDeferredWork);
 }
 
 void PageWidgetDelegate::paint(Page* page, PageOverlayList* overlays, WebCanvas* canvas, const WebRect& rect, CanvasBackground background)