Merge "Fix scrolling offset of ScrollableLayer when we touch them. With the new direct update, we are setting directly the layers position; but for ScrollableLayer, we already set their position in the UI, so for them their webkit counterpart is actually older/wrong. The fix consists simply in not updating the positioning of ScrollableLayer."

2 files changed, 3 insertions, 1 deletions

diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.h b/Source/WebCore/platform/graphics/android/LayerAndroid.h
index cd52937..4458a2c 100644
--- a/Source/WebCore/platform/graphics/android/LayerAndroid.h
+++ b/Source/WebCore/platform/graphics/android/LayerAndroid.h
@@ -280,7 +280,7 @@ public:
     // such as the position, the transform. Return true if anything more
     // complex is needed.
     bool updateWithTree(LayerAndroid*);
-    bool updateWithLayer(LayerAndroid*);
+    virtual bool updateWithLayer(LayerAndroid*);
 
     SkBitmapRef* imageRef() { return m_imageRef; }
     ImageTexture* imageTexture() { return m_imageTexture; }
diff --git a/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.h b/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.h
index a2486a5..5cba5d9 100644
--- a/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.h
+++ b/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.h
@@ -42,6 +42,8 @@ public:
 
     virtual LayerAndroid* copy() const { return new ScrollableLayerAndroid(*this); }
 
+    virtual bool updateWithLayer(LayerAndroid*) { return true; }
+
     // Scrolls to the given position in the layer.
     // Returns whether or not any scrolling was required.
     bool scrollTo(int x, int y);