Merge 141904

Source/WebKit/chromium/src/PageOverlay.cpp

Index: Source/WebKit/chromium/src/PageOverlay.cpp
===================================================================
--- Source/WebKit/chromium/src/PageOverlay.cpp	(revision 142272)
+++ Source/WebKit/chromium/src/PageOverlay.cpp	(working copy)
@@ -30,6 +30,7 @@
 #include "PageOverlay.h"
 
 #include "GraphicsLayer.h"
+#include "GraphicsLayerChromium.h"
 #include "GraphicsLayerClient.h"
 #include "Page.h"
 #include "PlatformContextSkia.h"
@@ -37,6 +38,7 @@
 #include "WebPageOverlay.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
+#include <public/WebLayer.h>
 
 using namespace WebCore;
 
@@ -141,6 +143,9 @@
 
     m_viewImpl->setOverlayLayer(m_layer.get());
     m_layer->setNeedsDisplay();
+
+    WebLayer* platformLayer = static_cast<GraphicsLayerChromium*>(m_layer.get())->platformLayer();
+    platformLayer->setShouldScrollOnMainThread(true);
 #endif
 }