diff options
| author | John Reck <jreck@google.com> | 2011-10-14 16:16:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-14 16:16:51 -0700 |
| commit | 5dbcb79ed2d4e7a3b7ebdf43b7e0048205d5da1a (patch) | |
| tree | d684274f8f2e4e75e9db30a5255f54bd37bd7a72 | |
| parent | 92738f1e982e39a6098acf39fcb5927502ec6b4c (diff) | |
| parent | 3775023f825fe036aa63878bf80bc1f7400b26f4 (diff) | |
| download | external_webkit-5dbcb79ed2d4e7a3b7ebdf43b7e0048205d5da1a.zip external_webkit-5dbcb79ed2d4e7a3b7ebdf43b7e0048205d5da1a.tar.gz external_webkit-5dbcb79ed2d4e7a3b7ebdf43b7e0048205d5da1a.tar.bz2 | |
Merge "Fix clipping" into ics-mr0
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLExtras.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLExtras.cpp b/Source/WebCore/platform/graphics/android/GLExtras.cpp index 540ca16..c6cb7f3 100644 --- a/Source/WebCore/platform/graphics/android/GLExtras.cpp +++ b/Source/WebCore/platform/graphics/android/GLExtras.cpp @@ -202,15 +202,8 @@ void GLExtras::drawFindOnPage(SkRect& viewport) void GLExtras::drawGL(IntRect& webViewRect, SkRect& viewport, int titleBarHeight) { if (m_drawExtra) { - // Update the clip. We want to use the screen clip - FloatRect glclip; - glclip.setX(webViewRect.x()); - glclip.setY(webViewRect.y() + titleBarHeight); - glclip.setWidth(webViewRect.width()); - glclip.setHeight(webViewRect.height()); - XLOG("Setting clip [%fx%f, %f, %f]", glclip.x(), glclip.y(), - glclip.width(), glclip.height()); - TilesManager::instance()->shader()->clip(glclip); + // TODO: Support clipping + glDisable(GL_SCISSOR_TEST); if (m_drawExtra == m_ring) drawCursorRings(); else if (m_drawExtra == m_findOnPage) @@ -218,5 +211,6 @@ void GLExtras::drawGL(IntRect& webViewRect, SkRect& viewport, int titleBarHeight else XLOGC("m_drawExtra %p is unknown! (cursor: %p, find: %p", m_drawExtra, m_ring, m_findOnPage); + glEnable(GL_SCISSOR_TEST); } } |