summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/nav/WebView.cpp
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-11-30 09:58:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-30 09:58:00 -0800
commitc75d89bc16f0cf638347ee3348f782b8309d8be3 (patch)
tree0e5bbe380b6a0d1067f6b4bc6960d472518b3962 /Source/WebKit/android/nav/WebView.cpp
parent57575d9ddf16a2fb5ad9fc4e539db311f6db6553 (diff)
parent06081e3d5c78c73256b49c85d05e7c41d9e2b6f1 (diff)
downloadexternal_webkit-c75d89bc16f0cf638347ee3348f782b8309d8be3.zip
external_webkit-c75d89bc16f0cf638347ee3348f782b8309d8be3.tar.gz
external_webkit-c75d89bc16f0cf638347ee3348f782b8309d8be3.tar.bz2
am 06081e3d: Merge "WebView Animation support" into ics-mr1
* commit '06081e3d5c78c73256b49c85d05e7c41d9e2b6f1': WebView Animation support
Diffstat (limited to 'Source/WebKit/android/nav/WebView.cpp')
-rw-r--r--Source/WebKit/android/nav/WebView.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 3ce623e..2de9ac6 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -1581,6 +1581,7 @@ class GLDrawFunctor : Functor {
WebCore::IntRect clip(info->clipLeft, info->clipTop,
info->clipRight - info->clipLeft,
info->clipBottom - info->clipTop);
+ TilesManager::instance()->shader()->setWebViewMatrix(info->transform, info->isLayer);
bool retVal = (*wvInstance.*funcPtr)(localViewRect, &inval, webViewRect,
titlebarHeight, clip, scale, extras);