diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-24 13:43:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-24 13:43:31 -0700 |
| commit | 9c52999fb17b49c672908e36aabda61abf63fe8f (patch) | |
| tree | f655896f403886405fed0fed6c2a5a30a732f505 /Source/WebKit/android/jni | |
| parent | c8d518ba99824a76fa842162ea8284a2261fa4a0 (diff) | |
| parent | dc5192de2d6f8637cef9be2ae52c8c100b2932e0 (diff) | |
| download | external_webkit-9c52999fb17b49c672908e36aabda61abf63fe8f.zip external_webkit-9c52999fb17b49c672908e36aabda61abf63fe8f.tar.gz external_webkit-9c52999fb17b49c672908e36aabda61abf63fe8f.tar.bz2 | |
Merge "Move scrollOffset into Layer class" into jb-dev
Diffstat (limited to 'Source/WebKit/android/jni')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 0add240..9d81edc 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -1555,7 +1555,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()); } |