Merge "simplify cursor ring draw state"

3 files changed, 49 insertions, 73 deletions

diff --git a/WebCore/platform/graphics/android/android_graphics.cpp b/WebCore/platform/graphics/android/android_graphics.cpp
index f8032c4..a584f0b 100644
--- a/WebCore/platform/graphics/android/android_graphics.cpp
+++ b/WebCore/platform/graphics/android/android_graphics.cpp
@@ -51,7 +51,6 @@ void CursorRing::draw(SkCanvas* canvas, LayerAndroid* layer)
         DBG_NAV_LOGD("canvas->quickReject cursorNode=%d (nodePointer=%p)"
             " bounds=(%d,%d,w=%d,h=%d)", m_node->index(), m_node->nodePointer(),
             m_bounds.x(), m_bounds.y(), m_bounds.width(), m_bounds.height());
-        m_followedLink = false;
         return;
     }
     const CachedColor& colors = m_frame->color(m_node);
@@ -75,13 +74,11 @@ void CursorRing::draw(SkCanvas* canvas, LayerAndroid* layer)
         SkIntToScalar(colors.radius())))->unref();
     SkColor outer;
     SkColor inner;
-    if (m_flavor >= NORMAL_ANIMATING) { // pressed
+    if (m_isPressed) {
         SkColor pressed;
         pressed = colors.fillColor();
         paint.setColor(pressed);
         canvas->drawPath(path, paint);
-    }
-    if (m_flavor >= NORMAL_ANIMATING) {
         outer = colors.pressedOuterColor();
         inner = colors.pressedInnerColor();
     } else {
@@ -138,30 +135,21 @@ bool CursorRing::setup()
     m_absBounds.inflate(SkScalarCeil(colors.outerWidth()));
     if (!m_node->hasCursorRing() || (m_node->isPlugin() && m_node->isFocus()))
         return false;
-    m_flavor = NORMAL_FLAVOR;
-    if (!m_isButton) {
-        m_flavor = m_node->isSyntheticLink() ? FAKE_FLAVOR : NORMAL_FLAVOR;
-        if (m_followedLink) {
-            m_flavor = static_cast<Flavor>(m_flavor + NORMAL_ANIMATING);
-        }
 #if DEBUG_NAV_UI
-        const WebCore::IntRect& ring = m_rings[0];
-        DBG_NAV_LOGD("cursorNode=%d (nodePointer=%p) flavor=%s rings=%d"
-            " (%d, %d, %d, %d) isPlugin=%s",
-            m_node->index(), m_node->nodePointer(),
-            m_flavor == FAKE_FLAVOR ? "FAKE_FLAVOR" :
-            m_flavor == NORMAL_ANIMATING ? "NORMAL_ANIMATING" :
-            m_flavor == FAKE_ANIMATING ? "FAKE_ANIMATING" : "NORMAL_FLAVOR",
-            m_rings.size(), ring.x(), ring.y(), ring.width(), ring.height(),
-            m_node->isPlugin() ? "true" : "false");
-        DBG_NAV_LOGD("[%d] inner=%d outer=%d outset=%d radius=%d"
-            " fill=0x%08x pin=0x%0x08x pout=0x%0x08x sin=0x%08x sout=0x%08x",
-            m_node->colorIndex(), colors.innerWidth(), colors.outerWidth(),
-            colors.outset(), colors.radius(), colors.fillColor(),
-            colors.pressedInnerColor(), colors.pressedOuterColor(),
-            colors.selectedInnerColor(), colors.selectedInnerColor());
+    const WebCore::IntRect& ring = m_rings[0];
+    DBG_NAV_LOGD("cursorNode=%d (nodePointer=%p) pressed=%s rings=%d"
+        " (%d, %d, %d, %d) isPlugin=%s",
+        m_node->index(), m_node->nodePointer(),
+        m_isPressed ? "true" : "false",
+        m_rings.size(), ring.x(), ring.y(), ring.width(), ring.height(),
+        m_node->isPlugin() ? "true" : "false");
+    DBG_NAV_LOGD("[%d] inner=%d outer=%d outset=%d radius=%d"
+        " fill=0x%08x pin=0x%08x pout=0x%08x sin=0x%08x sout=0x%08x",
+        m_node->colorIndex(), colors.innerWidth(), colors.outerWidth(),
+        colors.outset(), colors.radius(), colors.fillColor(),
+        colors.pressedInnerColor(), colors.pressedOuterColor(),
+        colors.selectedInnerColor(), colors.selectedInnerColor());
 #endif
-    }
     return true;
 }
 
diff --git a/WebCore/platform/graphics/android/android_graphics.h b/WebCore/platform/graphics/android/android_graphics.h
index 09482bd..e147634 100644
--- a/WebCore/platform/graphics/android/android_graphics.h
+++ b/WebCore/platform/graphics/android/android_graphics.h
@@ -51,14 +51,6 @@ class WebViewCore;
 
 class CursorRing : public DrawExtra {
 public:
-    enum Flavor {
-        NORMAL_FLAVOR,
-        FAKE_FLAVOR,
-        NORMAL_ANIMATING,
-        FAKE_ANIMATING,
-        ANIMATING_COUNT = 2
-    };
-
     CursorRing(WebViewCore* core) : m_viewImpl(core) {}
     virtual ~CursorRing() {}
     virtual void draw(SkCanvas* , LayerAndroid* );
@@ -72,9 +64,8 @@ private:
     const CachedRoot* m_root;
     const CachedFrame* m_frame;
     const CachedNode* m_node;
-    Flavor m_flavor;
-    bool m_followedLink;
     bool m_isButton;
+    bool m_isPressed;
 };
 
 }
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index a15ef39..9851ab5 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -172,7 +172,6 @@ WebView(JNIEnv* env, jobject javaWebView, int viewImpl) :
     m_navPictureUI = 0;
     m_generation = 0;
     m_heightCanMeasure = false;
-    m_ring.m_followedLink = false;
     m_lastDx = 0;
     m_lastDxTime = 0;
     m_ringAnimationEnd = 0;
@@ -266,7 +265,7 @@ void nativeRecordButtons(bool hasFocus, bool pressed, bool invalidate)
                 // button
                 if (!hasFocus) {
                     state = WebCore::RenderSkinAndroid::kNormal;
-                } else if (m_ring.m_followedLink || pressed) {
+                } else if (pressed) {
                     state = WebCore::RenderSkinAndroid::kPressed;
                 } else {
                     state = WebCore::RenderSkinAndroid::kFocused;
@@ -341,7 +340,7 @@ void calcOurContentVisibleRect(SkRect* r)
 
 void resetCursorRing()
 {
-    m_ring.m_followedLink = false;
+    m_ringAnimationEnd = 0;
     m_viewImpl->m_hasCursorBounds = false;
 }
 
@@ -363,12 +362,15 @@ bool drawCursorPreamble(CachedRoot* root)
     m_ring.m_root = root;
     m_ring.m_frame = frame;
     m_ring.m_node = node;
+    SkMSec time = SkTime::GetMSecs();
+    m_ring.m_isPressed = time < m_ringAnimationEnd
+        && m_ringAnimationEnd != UINT_MAX;
     return true;
 }
 
 void drawCursorPostamble()
 {
-    if (!m_ring.m_isButton && m_ring.m_flavor < CursorRing::NORMAL_ANIMATING)
+    if (m_ringAnimationEnd == UINT_MAX)
         return;
     SkMSec time = SkTime::GetMSecs();
     if (time < m_ringAnimationEnd) {
@@ -377,11 +379,7 @@ void drawCursorPostamble()
         invalBounds.intersect(m_ring.m_absBounds);
         postInvalidateDelayed(m_ringAnimationEnd - time, invalBounds);
     } else {
-        if (m_ring.m_followedLink)
-            hideCursor();
-        m_ring.m_followedLink = false;
-        m_ring.m_flavor = static_cast<CursorRing::Flavor>
-                (m_ring.m_flavor - CursorRing::NORMAL_ANIMATING);
+        hideCursor();
     }
 }
 
@@ -710,8 +708,6 @@ bool moveCursor(int keyCode, int count, bool ignoreScroll)
     int dx = 0;
     int dy = 0;
     int counter = count;
-    if (!cursor || !m_ring.m_followedLink)
-        root->setScrollOnly(m_ring.m_followedLink);
     while (--counter >= 0) {
         WebCore::IntPoint scroll = WebCore::IntPoint(0, 0);
         cachedNode = root->moveCursor(direction, &cachedFrame, &scroll);
@@ -743,13 +739,13 @@ bool moveCursor(int keyCode, int count, bool ignoreScroll)
     }
     bool result = false;
     if (cachedNode) {
+        showCursorUntimed();
         m_viewImpl->updateCursorBounds(root, cachedFrame, cachedNode);
         root->setCursor(const_cast<CachedFrame*>(cachedFrame),
                 const_cast<CachedNode*>(cachedNode));
         bool disableFocusController = cachedNode != root->currentFocus()
                 && cachedNode->wantsKeyEvents();
         sendMoveMouseIfLatest(disableFocusController);
-        viewInvalidate();
     } else {
         int docHeight = root->documentHeight();
         int docWidth = root->documentWidth();
@@ -816,16 +812,17 @@ void selectBestAt(const WebCore::IntRect& rect)
         m_viewImpl->m_hasCursorBounds = false;
         if (root)
             root->setCursor(0, 0);
+        viewInvalidate();
     } else {
         DBG_NAV_LOGD("CachedNode:%p (%d)", node, node->index());
         WebCore::IntRect bounds = node->bounds(frame);
         root->rootHistory()->setMouseBounds(frame->unadjustBounds(node, bounds));
         m_viewImpl->updateCursorBounds(root, frame, node);
+        showCursorTimed();
         root->setCursor(const_cast<CachedFrame*>(frame),
                 const_cast<CachedNode*>(node));
     }
     sendMoveMouseIfLatest(false);
-    viewInvalidate();
 }
 
 WebCore::IntRect getNavBounds()
@@ -861,7 +858,6 @@ bool pointInNavCache(int x, int y, int slop)
 bool motionUp(int x, int y, int slop)
 {
     bool pageScrolled = false;
-    m_ring.m_followedLink = false;
     IntRect rect = IntRect(x - slop, y - slop, slop * 2, slop * 2);
     int rx, ry;
     CachedRoot* root = getFrameCache(AllowNewer);
@@ -894,19 +890,18 @@ bool motionUp(int x, int y, int slop)
     m_viewImpl->updateCursorBounds(root, frame, result);
     root->setCursor(const_cast<CachedFrame*>(frame),
         const_cast<CachedNode*>(result));
-    bool syntheticLink = result->isSyntheticLink();
-    if (!syntheticLink) {
+    if (result->isSyntheticLink())
+        overrideUrlLoading(result->getExport());
+    else {
         sendMotionUp(
             (WebCore::Frame*) frame->framePointer(),
             (WebCore::Node*) result->nodePointer(), rx, ry);
     }
-    viewInvalidate();
-    if (!result->isTextInput()) {
-        if (!result->isSelect() && !result->isContentEditable())
-            setFollowedLink(true);
-        if (syntheticLink)
-            overrideUrlLoading(result->getExport());
-    }
+    if (result->isTextInput() || result->isSelect()
+            || result->isContentEditable()) {
+        showCursorUntimed();
+    } else
+        showCursorTimed();
     return pageScrolled;
 }
 
@@ -952,12 +947,18 @@ void setFindIsEmpty()
     m_findOnPage.clearCurrentLocation();
 }
 
-void setFollowedLink(bool followed)
+void showCursorTimed()
 {
-    if ((m_ring.m_followedLink = followed) != false) {
-        m_ringAnimationEnd = SkTime::GetMSecs() + 500;
-        viewInvalidate();
-    }
+    DBG_NAV_LOG("");
+    m_ringAnimationEnd = SkTime::GetMSecs() + 500;
+    viewInvalidate();
+}
+
+void showCursorUntimed()
+{
+    DBG_NAV_LOG("");
+    m_ringAnimationEnd = UINT_MAX;
+    viewInvalidate();
 }
 
 void setHeightCanMeasure(bool measure)
@@ -1802,14 +1803,9 @@ static void nativeSetFindIsEmpty(JNIEnv *env, jobject obj)
     GET_NATIVE_VIEW(env, obj)->setFindIsEmpty();
 }
 
-static void nativeSetFollowedLink(JNIEnv *env, jobject obj, bool followed)
+static void nativeShowCursorTimed(JNIEnv *env, jobject obj)
 {
-    const CachedNode* cursor = getCursorNode(env, obj);
-    if (cursor && !cursor->isSelect() && ! cursor->isContentEditable()) {
-        WebView* view = GET_NATIVE_VIEW(env, obj);
-        LOG_ASSERT(view, "view not set in %s", __FUNCTION__);
-        view->setFollowedLink(followed);
-    }
+    GET_NATIVE_VIEW(env, obj)->showCursorTimed();
 }
 
 static void nativeSetHeightCanMeasure(JNIEnv *env, jobject obj, bool measure)
@@ -1957,6 +1953,7 @@ static bool nativeMoveCursorToNextTextInput(JNIEnv *env, jobject obj)
     const WebCore::IntRect& bounds = next->bounds(frame);
     root->rootHistory()->setMouseBounds(frame->unadjustBounds(next, bounds));
     view->getWebViewCore()->updateCursorBounds(root, frame, next);
+    view->showCursorUntimed();
     root->setCursor(const_cast<CachedFrame*>(frame),
             const_cast<CachedNode*>(next));
     view->sendMoveFocus(static_cast<WebCore::Frame*>(frame->framePointer()),
@@ -2250,8 +2247,6 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeSetFindIsEmpty },
     { "nativeSetFindIsUp", "(Z)V",
         (void*) nativeSetFindIsUp },
-    { "nativeSetFollowedLink", "(Z)V",
-        (void*) nativeSetFollowedLink },
     { "nativeSetHeightCanMeasure", "(Z)V",
         (void*) nativeSetHeightCanMeasure },
     { "nativeSetBaseLayer", "(I)V",
@@ -2264,6 +2259,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeHasContent },
     { "nativeSetSelectionPointer", "(ZFII)V",
         (void*) nativeSetSelectionPointer },
+    { "nativeShowCursorTimed", "()V",
+        (void*) nativeShowCursorTimed },
     { "nativeStartSelection", "(II)Z",
         (void*) nativeStartSelection },
     { "nativeSubtractLayers", "(Landroid/graphics/Rect;)Landroid/graphics/Rect;",