diff options
author | Nicolas Roard <nicolasroard@google.com> | 2011-10-07 11:54:14 -0700 |
---|---|---|
committer | Nicolas Roard <nicolasroard@google.com> | 2011-10-07 11:54:14 -0700 |
commit | c5f63ef8fd51a45d0a11a84cb65301c66e6c6cac (patch) | |
tree | b56197a926d6e570c2b7018622c1052f66067338 /Source | |
parent | d30f6301a4ea49037d31781bb238a4230c4c1389 (diff) | |
download | external_webkit-c5f63ef8fd51a45d0a11a84cb65301c66e6c6cac.zip external_webkit-c5f63ef8fd51a45d0a11a84cb65301c66e6c6cac.tar.gz external_webkit-c5f63ef8fd51a45d0a11a84cb65301c66e6c6cac.tar.bz2 |
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.
bug:5421867
Change-Id: Ia14e41aff641173a45ed898cd3b3eceab3f7bd7a
Diffstat (limited to 'Source')
-rw-r--r-- | Source/WebCore/platform/graphics/android/LayerAndroid.h | 2 | ||||
-rw-r--r-- | Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.h | 2 |
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); |