Merge 141904

Source/WebKit/chromium/src/PageOverlay.cpp

 /*
  * Copyright (C) 2011 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:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 12 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "PageOverlay.h"
 
 #include "GraphicsLayer.h"
+#include "GraphicsLayerChromium.h"
 #include "GraphicsLayerClient.h"
 #include "Page.h"
 #include "PlatformContextSkia.h"
 #include "Settings.h"
 #include "WebPageOverlay.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
+#include <public/WebLayer.h>
 
 using namespace WebCore;
 
 namespace WebKit {
 
 namespace {
 
 WebCanvas* ToWebCanvas(GraphicsContext* gc)
 {
     return gc->platformContext()->canvas();
@@ skipping 84 matching lines @@
     FloatSize size(m_viewImpl->size());
     if (size != m_layer->size()) {
         // Triggers re-adding to root layer to ensure that we are on top of
         // scrollbars.
         m_layer->removeFromParent();
         m_layer->setSize(size);
     }
 
     m_viewImpl->setOverlayLayer(m_layer.get());
     m_layer->setNeedsDisplay();
+
+    WebLayer* platformLayer = static_cast<GraphicsLayerChromium*>(m_layer.get())->platformLayer();
+    platformLayer->setShouldScrollOnMainThread(true);
 #endif
 }
 
 void PageOverlay::paintWebFrame(GraphicsContext& gc)
 {
     if (!m_viewImpl->isAcceleratedCompositingActive()) {
         gc.save();
         m_overlay->paintPageOverlay(ToWebCanvas(&gc));
         gc.restore();
     }
 }
 
 void PageOverlay::invalidateWebFrame()
 {
     // WebPageOverlay does the actual painting of the overlay.
     // Here we just make sure to invalidate.
     if (!m_viewImpl->isAcceleratedCompositingActive()) {
         // FIXME: able to invalidate a smaller rect.
         // FIXME: Is it important to just invalidate a smaller rect given that
         // this is not on a critical codepath? In order to do so, we'd
         // have to take scrolling into account.
         const WebSize& size = m_viewImpl->size();
         WebRect damagedRect(0, 0, size.width, size.height);
         if (m_viewImpl->client())
             m_viewImpl->client()->didInvalidateRect(damagedRect);
     }
 }
 
 } // namespace WebKit