diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-24 13:48:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 13:48:19 -0700 |
| commit | c9c8437e850b3e70ee3e7d581847d67582bbbe7f (patch) | |
| tree | 811ca9455b929401ffb311cfb3890a0ebefdbea0 /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | 6b009e8771885fecef109c34e30b9d59e5ecaab9 (diff) | |
| parent | fe5bfa1befcb0e865d69d497280db9b16b361da8 (diff) | |
| download | external_webkit-c9c8437e850b3e70ee3e7d581847d67582bbbe7f.zip external_webkit-c9c8437e850b3e70ee3e7d581847d67582bbbe7f.tar.gz external_webkit-c9c8437e850b3e70ee3e7d581847d67582bbbe7f.tar.bz2 | |
am fe5bfa1b: am 9c52999f: Merge "Move scrollOffset into Layer class" into jb-dev
* commit 'fe5bfa1befcb0e865d69d497280db9b16b361da8':
Move scrollOffset into Layer class
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
| -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 74fc8a0..874a812 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()); } |