From 868c42d56aae84ed4cd33f9de0d93132e1483ddc Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Mon, 9 Apr 2012 15:57:01 -0700 Subject: Move the matrix support to rely on the new framework clip info In this new way, we don't need to worry about the animation offset, b/c it is in the clip rect. Also add the matrix support for video layer. bug:5684832 Change-Id: I08e22ca042e425f8f7af935b60e04f2a4dbc52df --- Source/WebKit/android/nav/WebView.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source/WebKit/android/nav/WebView.cpp') diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 22598eb..215bf43 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -723,7 +723,9 @@ class GLDrawFunctor : Functor { localViewRect.setY(info->height - clip.y() - clip.height()); } bool shouldDraw = (messageId == uirenderer::DrawGlInfo::kModeDraw); - TilesManager::instance()->shader()->setWebViewMatrix(info->transform, info->isLayer); + // Send the necessary info to the shader. + TilesManager::instance()->shader()->setGLDrawInfo(info); + int returnFlags = (*wvInstance.*funcPtr)(localViewRect, &inval, webViewRect, titlebarHeight, clip, scale, extras, shouldDraw); if ((returnFlags & uirenderer::DrawGlInfo::kStatusDraw) != 0) { -- cgit v1.1