am 58348114: Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2

* commit '58348114645f3987aaabae40612a876cfd2bc678':
  DO NOT MERGE cursor ring drawing in GL

1 files changed, 11 insertions, 6 deletions

diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index b294112..f29d218 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -470,13 +470,18 @@ bool drawGL(WebCore::IntRect& viewRect, WebCore::IntRect* invalRect, WebCore::In
     SkPicture picture;
     IntRect rect(0, 0, 0, 0);
     bool allowSame = false;
+    m_glWebViewState->resetRings();
     if (extra) {
-        LayerAndroid mainPicture(m_navPictureUI);
-        PictureSet* content = m_baseLayer->content();
-        SkCanvas* canvas = picture.beginRecording(content->width(),
-            content->height());
-        extra->draw(canvas, &mainPicture, &rect);
-        picture.endRecording();
+        if (extra == &m_ring) {
+            m_glWebViewState->setRings(m_ring.rings(), m_ring.m_isPressed);
+        } else {
+            LayerAndroid mainPicture(m_navPictureUI);
+            PictureSet* content = m_baseLayer->content();
+            SkCanvas* canvas = picture.beginRecording(content->width(),
+                content->height());
+            extra->draw(canvas, &mainPicture, &rect);
+            picture.endRecording();
+        }
     } else if (extras == DrawExtrasCursorRing && m_ring.m_isButton) {
         const CachedFrame* cachedFrame;
         const CachedNode* cachedCursor = root->currentCursor(&cachedFrame);