summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-06-12 16:32:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-12 16:32:53 -0700
commitb8dbaafe072de1d92a3de8d9be6165683a647ace (patch)
tree3ccce502b2aaa51319b7a51d6cb197a04cb78554 /Source/WebKit
parent9b2be7161983b795edb1ea0e9e70547cd9e466bd (diff)
parentf8a89eaa1361ce1e71ec7fa9065103fd0b305b5f (diff)
downloadexternal_webkit-b8dbaafe072de1d92a3de8d9be6165683a647ace.zip
external_webkit-b8dbaafe072de1d92a3de8d9be6165683a647ace.tar.gz
external_webkit-b8dbaafe072de1d92a3de8d9be6165683a647ace.tar.bz2
Merge "Call the right updatePositions*" into jb-dev
Diffstat (limited to 'Source/WebKit')
-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