diff options
| author | John Reck <jreck@google.com> | 2011-06-27 17:25:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-27 17:25:34 -0700 |
| commit | 30375bd7b8396c98aac134419306b45f79fc10d8 (patch) | |
| tree | e2751f1faa6ca6e397c166a74016c94610df6ea4 /Source/WebKit/android/nav | |
| parent | b35ff6918673c5adf6e7cd4cbf636c9919abbaed (diff) | |
| parent | d49eb7fca9df148a14bfda4918647f68abc52a13 (diff) | |
| download | external_webkit-30375bd7b8396c98aac134419306b45f79fc10d8.zip external_webkit-30375bd7b8396c98aac134419306b45f79fc10d8.tar.gz external_webkit-30375bd7b8396c98aac134419306b45f79fc10d8.tar.bz2 | |
Merge "Prevent GL rings on layers"
Diffstat (limited to 'Source/WebKit/android/nav')
| -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(); |