summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-09-01 09:30:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-01 09:30:09 -0700
commit279c3d30edcdb72407a73b7ecb1e6e737423212b (patch)
tree9ad9dddc38981089a812bd9ddf07326faa398892 /Source/WebKit
parented544a3dc0117e0f1e554b44016cd6031dbc2fb5 (diff)
parent078f4452393311da6165131451fcf86e04e04f25 (diff)
downloadexternal_webkit-279c3d30edcdb72407a73b7ecb1e6e737423212b.zip
external_webkit-279c3d30edcdb72407a73b7ecb1e6e737423212b.tar.gz
external_webkit-279c3d30edcdb72407a73b7ecb1e6e737423212b.tar.bz2
Merge "WebView animation support"
Diffstat (limited to 'Source/WebKit')
-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 5cf9953..8835f70 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);
bool retVal = (*wvInstance.*funcPtr)(localViewRect, &inval, webViewRect, titlebarHeight, clip, scale, extras);
if (retVal) {