summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-05-07 07:29:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-07 07:29:14 -0700
commit5331af464fa0f4a08cbfe84f1de2ebab0038f2c1 (patch)
tree0a45d464a7566987dfa197cd3238a33114f81b21 /Source/WebKit/android
parente712b54e831d077c789984b8206f64d81dbceaa2 (diff)
parent0e43fd01178d539d44a5dfade3bf15aa6efbe02a (diff)
downloadexternal_webkit-5331af464fa0f4a08cbfe84f1de2ebab0038f2c1.zip
external_webkit-5331af464fa0f4a08cbfe84f1de2ebab0038f2c1.tar.gz
external_webkit-5331af464fa0f4a08cbfe84f1de2ebab0038f2c1.tar.bz2
Merge "Ensure updateGLPositionsAndScale is called from updateLayerPosition." into jb-dev
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 603b9d1..dae34d8 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -590,7 +590,7 @@ const TransformationMatrix* getLayerTransform(int layerId) {
// We need to make sure the drawTransform is up to date as this is
// called before a draw() or drawGL()
if (layer) {
- m_baseLayer->updateLayerPositions(m_visibleContentRect);
+ m_baseLayer->updatePositionsRecursive(m_visibleContentRect);
return layer->drawTransform();
}
}