diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-16 09:24:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-16 09:24:18 -0700 |
| commit | 893264ea664be9af3ac64e24116045b51df6f031 (patch) | |
| tree | ea9d9f9e775e624c08069187cc68fff1ce8e19a2 /Source/WebKit | |
| parent | 0d4121b7ae5f54bb2973bd1c3d20a17c58865a5b (diff) | |
| parent | 868c42d56aae84ed4cd33f9de0d93132e1483ddc (diff) | |
| download | external_webkit-893264ea664be9af3ac64e24116045b51df6f031.zip external_webkit-893264ea664be9af3ac64e24116045b51df6f031.tar.gz external_webkit-893264ea664be9af3ac64e24116045b51df6f031.tar.bz2 | |
Merge "Move the matrix support to rely on the new framework clip info"
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) { |