diff options
| author | John Reck <jreck@google.com> | 2011-10-17 11:30:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-17 11:30:54 -0700 |
| commit | 54c45f23c24446f5e165f63383a31016f56dfd75 (patch) | |
| tree | da4eb45c315f7986ebd7705e91a2a4c919359ac0 | |
| parent | 54a414c7496fb9fc820a161e5199f0a22d806b95 (diff) | |
| parent | 5dbcb79ed2d4e7a3b7ebdf43b7e0048205d5da1a (diff) | |
| download | external_webkit-54c45f23c24446f5e165f63383a31016f56dfd75.zip external_webkit-54c45f23c24446f5e165f63383a31016f56dfd75.tar.gz external_webkit-54c45f23c24446f5e165f63383a31016f56dfd75.tar.bz2 | |
am 5dbcb79e: Merge "Fix clipping" into ics-mr0
* commit '5dbcb79ed2d4e7a3b7ebdf43b7e0048205d5da1a':
Fix clipping
| -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); } } |