1 files changed, 18 insertions, 17 deletions

diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 38d0ccb..edd362c 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -303,10 +303,8 @@ void nativeRecordButtons(bool hasFocus, bool pressed, bool invalidate)
                 if (hasFocus) {
                     if (pressed || m_ring.m_isPressed)
                         state = RenderSkinAndroid::kPressed;
-                    else if (SkTime::GetMSecs() < m_ringAnimationEnd
-                        && m_ringAnimationEnd != UINT_MAX) {
+                    else if (SkTime::GetMSecs() < m_ringAnimationEnd)
                         state = RenderSkinAndroid::kFocused;
-                    }
                 }
             }
             ptr->updateFocusState(state);
@@ -390,6 +388,7 @@ bool drawCursorPreamble(CachedRoot* root)
         resetCursorRing();
         return false;
     }
+    m_ring.setIsButton(node);
     if (node->isHidden()) {
         DBG_NAV_LOG("node->isHidden()");
         m_viewImpl->m_hasCursorBounds = false;
@@ -439,7 +438,7 @@ bool drawGL(WebCore::IntRect& viewRect, float scale, int extras)
         m_glWebViewState = new GLWebViewState(&m_viewImpl->gButtonMutex);
         if (m_baseLayer->content()) {
             IntRect rect(0, 0, m_baseLayer->content()->width(), m_baseLayer->content()->height());
-            m_glWebViewState->setBaseLayer(m_baseLayer, rect);
+            m_glWebViewState->setBaseLayer(m_baseLayer, rect, false);
         }
     }
 
@@ -473,6 +472,7 @@ bool drawGL(WebCore::IntRect& viewRect, float scale, int extras)
 
     SkPicture picture;
     IntRect rect(0, 0, 0, 0);
+    bool allowSame = false;
     if (extra) {
         LayerAndroid mainPicture(m_navPictureUI);
         PictureSet* content = m_baseLayer->content();
@@ -480,8 +480,15 @@ bool drawGL(WebCore::IntRect& viewRect, float scale, int extras)
             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);
+        if (cachedCursor) {
+            rect = cachedCursor->bounds(cachedFrame);
+            allowSame = true;
+        }
     }
-    m_glWebViewState->setExtra(m_baseLayer, picture, rect);
+    m_glWebViewState->setExtra(m_baseLayer, picture, rect, allowSame);
 
     LayerAndroid* compositeLayer = compositeRoot();
     if (compositeLayer)
@@ -489,12 +496,7 @@ bool drawGL(WebCore::IntRect& viewRect, float scale, int extras)
 
     SkRect visibleRect;
     calcOurContentVisibleRect(&visibleRect);
-
-    m_viewImpl->setVisibleScreenWidth(visibleRect.width());
-    m_viewImpl->setVisibleScreenHeight(visibleRect.height());
-
     bool ret = m_glWebViewState->drawGL(viewRect, visibleRect, scale);
-
     if (ret || m_glWebViewState->currentPictureCounter() != pic)
         return true;
 #endif
@@ -556,8 +558,6 @@ PictureSet* draw(SkCanvas* canvas, SkColor bgColor, int extras, bool split)
     compositeLayer->setExtra(extra);
     SkRect visible;
     calcOurContentVisibleRect(&visible);
-    m_viewImpl->setVisibleScreenWidth(visible.width());
-    m_viewImpl->setVisibleScreenHeight(visible.height());
     // call this to be sure we've adjusted for any scrolling or animations
     // before we actually draw
     compositeLayer->updateFixedLayersPositions(visible);
@@ -1383,11 +1383,11 @@ static void copyScrollPositionRecursive(const LayerAndroid* from,
 }
 #endif
 
-void setBaseLayer(BaseLayerAndroid* layer, WebCore::IntRect& rect)
+void setBaseLayer(BaseLayerAndroid* layer, WebCore::IntRect& rect, bool showVisualIndicator)
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (m_glWebViewState)
-        m_glWebViewState->setBaseLayer(layer, rect);
+        m_glWebViewState->setBaseLayer(layer, rect, showVisualIndicator);
 #endif
 
 #if ENABLE(ANDROID_OVERFLOW_SCROLL)
@@ -1770,11 +1770,12 @@ static bool nativeEvaluateLayersAnimations(JNIEnv *env, jobject obj)
     return false;
 }
 
-static void nativeSetBaseLayer(JNIEnv *env, jobject obj, jint layer, jobject jrect)
+static void nativeSetBaseLayer(JNIEnv *env, jobject obj, jint layer, jobject jrect,
+                                jboolean showVisualIndicator)
 {
     BaseLayerAndroid* layerImpl = reinterpret_cast<BaseLayerAndroid*>(layer);
     WebCore::IntRect rect = jrect_to_webrect(env, jrect);
-    GET_NATIVE_VIEW(env, obj)->setBaseLayer(layerImpl, rect);
+    GET_NATIVE_VIEW(env, obj)->setBaseLayer(layerImpl, rect, showVisualIndicator);
 }
 
 static void nativeReplaceBaseContent(JNIEnv *env, jobject obj, jint content)
@@ -2566,7 +2567,7 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeSetFindIsUp },
     { "nativeSetHeightCanMeasure", "(Z)V",
         (void*) nativeSetHeightCanMeasure },
-    { "nativeSetBaseLayer", "(ILandroid/graphics/Rect;)V",
+    { "nativeSetBaseLayer", "(ILandroid/graphics/Rect;Z)V",
         (void*) nativeSetBaseLayer },
     { "nativeReplaceBaseContent", "(I)V",
         (void*) nativeReplaceBaseContent },