summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni/WebViewCore.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-05-23 18:23:04 -0700
committerChris Craik <ccraik@google.com>2012-05-23 18:30:55 -0700
commitdc5192de2d6f8637cef9be2ae52c8c100b2932e0 (patch)
tree482e02377fe3a3228ee52bb2cd6e5e7644f29bb2 /Source/WebKit/android/jni/WebViewCore.cpp
parent55d602593a60888cfc87c244a5e3258f35bae50e (diff)
downloadexternal_webkit-dc5192de2d6f8637cef9be2ae52c8c100b2932e0.zip
external_webkit-dc5192de2d6f8637cef9be2ae52c8c100b2932e0.tar.gz
external_webkit-dc5192de2d6f8637cef9be2ae52c8c100b2932e0.tar.bz2
Move scrollOffset into Layer class
Layer can now use the offset to paint, resulting in correct translates for overflow:scroll layers in the Layer::draw() path. bug:6548000 Change-Id: I1dfb88b15491e72e6c3841ce2953e114124e40fd
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index d07b00e..f382e2d 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -1552,7 +1552,7 @@ void WebViewCore::layerToAbsoluteOffset(const LayerAndroid* layer, IntPoint& off
while (layer) {
const SkPoint& pos = layer->getPosition();
offset.move(pos.fX, pos.fY);
- const IntPoint& scroll = layer->scrollOffset();
+ const IntPoint& scroll = layer->getScrollOffset();
offset.move(-scroll.x(), -scroll.y());
layer = static_cast<LayerAndroid*>(layer->getParent());
}