Scroll the RenderLayer during touch events.

Keep track of the owning layer for each LayerAndroid. No longer need to unadjust
the node bounds since the node will be scrolled into view.

Bug: 3442108
Change-Id: I7c9604d347af326ccfb86e6d3f2b95b7ce1b97c1

1 files changed, 3 insertions, 3 deletions

diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index ccc872a..f2163cc 100644
--- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -122,8 +122,8 @@ GraphicsLayerAndroid::GraphicsLayerAndroid(GraphicsLayerClient* client) :
     m_foregroundLayer(0),
     m_foregroundClipLayer(0)
 {
-    m_contentLayer = new LayerAndroid(true);
     RenderLayer* renderLayer = renderLayerFromClient(m_client);
+    m_contentLayer = new LayerAndroid(renderLayer, true);
     if (renderLayer) {
         m_contentLayer->setIsRootLayer(renderLayer->isRootLayer()
             && !(renderLayer->renderer()->frame()->ownerElement()));
@@ -487,8 +487,8 @@ void GraphicsLayerAndroid::updateScrollingLayers()
         ASSERT(!hasOverflowScroll);
         if (layerNeedsOverflow) {
             ASSERT(!m_foregroundLayer && !m_foregroundClipLayer);
-            m_foregroundLayer = new ScrollableLayerAndroid();
-            m_foregroundClipLayer = new LayerAndroid(false);
+            m_foregroundLayer = new ScrollableLayerAndroid(layer);
+            m_foregroundClipLayer = new LayerAndroid(layer, false);
             m_foregroundClipLayer->setMasksToBounds(true);
             m_foregroundClipLayer->addChild(m_foregroundLayer);
             m_contentLayer->addChild(m_foregroundClipLayer);