diff options
author | Nicolas Roard <nicolasroard@google.com> | 2011-10-07 12:04:05 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-07 12:04:05 -0700 |
commit | 63147313cabd16f95cd018f8b5ecc5070a985fe5 (patch) | |
tree | abf3471c7c69d91ee688f8fda75cce86c6954ba6 /Source/WebCore/platform/graphics/android/LayerAndroid.h | |
parent | c3f68dccf70f1fb40364f071f20459da040ee3e7 (diff) | |
parent | c5f63ef8fd51a45d0a11a84cb65301c66e6c6cac (diff) | |
download | external_webkit-63147313cabd16f95cd018f8b5ecc5070a985fe5.zip external_webkit-63147313cabd16f95cd018f8b5ecc5070a985fe5.tar.gz external_webkit-63147313cabd16f95cd018f8b5ecc5070a985fe5.tar.bz2 |
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."
Diffstat (limited to 'Source/WebCore/platform/graphics/android/LayerAndroid.h')
-rw-r--r-- | Source/WebCore/platform/graphics/android/LayerAndroid.h | 2 |
1 files changed, 1 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; } |