summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-06-12 16:35:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-12 16:35:53 -0700
commit101ff140ede0e7b633699bdb98bddd25b17b6eb2 (patch)
tree3ccce502b2aaa51319b7a51d6cb197a04cb78554 /Source/WebKit/android
parentd09512ae937be11ff906a1e2482c9b7166b45f73 (diff)
parentb8dbaafe072de1d92a3de8d9be6165683a647ace (diff)
downloadexternal_webkit-101ff140ede0e7b633699bdb98bddd25b17b6eb2.zip
external_webkit-101ff140ede0e7b633699bdb98bddd25b17b6eb2.tar.gz
external_webkit-101ff140ede0e7b633699bdb98bddd25b17b6eb2.tar.bz2
am b8dbaafe: Merge "Call the right updatePositions*" into jb-dev
* commit 'b8dbaafe072de1d92a3de8d9be6165683a647ace': Call the right updatePositions*
Diffstat (limited to 'Source/WebKit/android')
-rw-r--r--Source/WebKit/android/nav/WebView.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 38ba451..a67b5fd 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -316,7 +316,7 @@ void draw(SkCanvas* canvas, SkColor bgColor, DrawExtras extras)
// call this to be sure we've adjusted for any scrolling or animations
// before we actually draw
- m_baseLayer->updateLayerPositions(m_visibleContentRect);
+ m_baseLayer->updatePositionsRecursive(m_visibleContentRect);
m_baseLayer->updatePositions();
// We have to set the canvas' matrix on the base layer