diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-09 15:57:01 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-13 15:06:32 -0700 |
| commit | 868c42d56aae84ed4cd33f9de0d93132e1483ddc (patch) | |
| tree | 5bfa1b6bd0f2dd63d281ef5b4b514a6669138669 /Source/WebKit | |
| parent | 85213faae54abd12e8debbf768235403a22faa03 (diff) | |
| download | external_webkit-868c42d56aae84ed4cd33f9de0d93132e1483ddc.zip external_webkit-868c42d56aae84ed4cd33f9de0d93132e1483ddc.tar.gz external_webkit-868c42d56aae84ed4cd33f9de0d93132e1483ddc.tar.bz2 | |
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
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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) { |