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

Source/web/PageWidgetDelegate.cpp

 /*
  * Copyright (C) 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "config.h"
 #include "PageWidgetDelegate.h"
 
 #include "PageOverlayList.h"
 #include "WebInputEvent.h"
 #include "WebInputEventConversion.h"
 #include "core/page/EventHandler.h"
 #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;
 
 namespace WebKit {
 
 static inline FrameView* mainFrameView(Page* page)
 {
     if (!page)
         return 0;
@@ skipping 20 matching lines @@
     // they need to be told that we are updating the screen. The problem is that
     // the native widgets need to recalculate their clip region and not overlap
     // any of our non-native widgets. To force the resizing, call
     // setFrameRect(). This will be a quick operation for most frames, but the
     // NativeWindowWidgets will update a proper clipping region.
     view->setFrameRect(view->frameRect());
 
     // 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)
 {
     if (rect.isEmpty())
         return;
     GraphicsContext gc(canvas);
     gc.setCertainlyOpaque(background == Opaque);
     gc.applyDeviceScaleFactor(page->deviceScaleFactor());
     gc.setUseHighResMarkers(page->deviceScaleFactor() > 1.5f);
@@ skipping 118 matching lines @@
 {
     return mainFrame.eventHandler()->handleWheelEvent(PlatformWheelEventBuilder(mainFrame.view(), event));
 }
 
 bool PageWidgetEventHandler::handleTouchEvent(Frame& mainFrame, const WebTouchEvent& event)
 {
     return mainFrame.eventHandler()->handleTouchEvent(PlatformTouchEventBuilder(mainFrame.view(), event));
 }
 
 }