diff options
| author | John Reck <jreck@google.com> | 2011-06-27 17:16:21 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-06-27 17:16:21 -0700 |
| commit | d49eb7fca9df148a14bfda4918647f68abc52a13 (patch) | |
| tree | 04cec956243892a39eb87dd116ba153752b4e8c2 | |
| parent | 53448d163d8dbb96e2d01046483298b078c17eb0 (diff) | |
| download | external_webkit-d49eb7fca9df148a14bfda4918647f68abc52a13.zip external_webkit-d49eb7fca9df148a14bfda4918647f68abc52a13.tar.gz external_webkit-d49eb7fca9df148a14bfda4918647f68abc52a13.tar.bz2 | |
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
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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(); |