diff options
| author | John Reck <jreck@google.com> | 2011-11-07 11:21:27 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-11-07 16:04:14 -0800 |
| commit | 58eca1f9d6c243c24ca8a07bdca0539780f714f2 (patch) | |
| tree | 61562e38ec3844d5f6a14e1577d9cd6b38def607 /Source/WebCore | |
| parent | 82ccbd8ce95211b4b5afad6a653462fd3beb771b (diff) | |
| download | external_webkit-58eca1f9d6c243c24ca8a07bdca0539780f714f2.zip external_webkit-58eca1f9d6c243c24ca8a07bdca0539780f714f2.tar.gz external_webkit-58eca1f9d6c243c24ca8a07bdca0539780f714f2.tar.bz2 | |
Fix extras clipping
Bug: 5556494
Change-Id: I82e8282271dfc623afa9b1ef0d0061ca9c3df5f4
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLExtras.cpp | 3 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLExtras.cpp b/Source/WebCore/platform/graphics/android/GLExtras.cpp index c6cb7f3..873ea33 100644 --- a/Source/WebCore/platform/graphics/android/GLExtras.cpp +++ b/Source/WebCore/platform/graphics/android/GLExtras.cpp @@ -202,8 +202,6 @@ void GLExtras::drawFindOnPage(SkRect& viewport) void GLExtras::drawGL(IntRect& webViewRect, SkRect& viewport, int titleBarHeight) { if (m_drawExtra) { - // TODO: Support clipping - glDisable(GL_SCISSOR_TEST); if (m_drawExtra == m_ring) drawCursorRings(); else if (m_drawExtra == m_findOnPage) @@ -211,6 +209,5 @@ 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); } } diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index a44a743..489a337 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -474,6 +474,8 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, double currentTime = setupDrawing(rect, viewport, webViewRect, titleBarHeight, clip, scale); ret |= baseLayer->drawGL(currentTime, compositedRoot, rect, viewport, scale, buffersSwappedPtr); + FloatRect extrasclip(0, 0, rect.width(), rect.height()); + TilesManager::instance()->shader()->clip(extrasclip); m_glExtras.drawGL(webViewRect, viewport, titleBarHeight); glBindBuffer(GL_ARRAY_BUFFER, 0); |