From d49eb7fca9df148a14bfda4918647f68abc52a13 Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 27 Jun 2011 17:16:21 -0700 Subject: Prevent GL rings on layers Bug: 4496611 Rings on layers are still drawn with the software path, but the gl ones are also drawn and in the wrong location. For now, prevent the drawing of the incorrect GL rings Change-Id: I7436dec9da3ce936b2ed0c4aa549a31b00e6e066 --- Source/WebKit/android/nav/WebView.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/WebKit/android/nav/WebView.cpp') diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 236c07b..e0bb6b4 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -482,7 +482,8 @@ bool drawGL(WebCore::IntRect& viewRect, WebCore::IntRect* invalRect, WebCore::In m_glWebViewState->resetRings(); if (extra) { if (extra == &m_ring) { - m_glWebViewState->setRings(m_ring.rings(), m_ring.m_isPressed); + if (root == m_ring.m_frame) + m_glWebViewState->setRings(m_ring.rings(), m_ring.m_isPressed); } else { LayerAndroid mainPicture(m_navPictureUI); PictureSet* content = m_baseLayer->content(); -- cgit v1.1