simplify cursor ring draw state

Removed old code and state that used to allow for the cursor
ring to be different if a synthetic link was pressed, state
that allowed the ring to animate, and state that attempted to
show the ring until the link it represented was replaced by
a new page.

The new code
- shows the cursor ring indefinitely when the trackball or dpad is moved
- shows the cursor for 500 ms when the trackball or dpad is clicked
  or if the screen is tapped.

This is separate from logic that attempts to select whether to
show the cursor ring at all; this merely chooses how long to
show the cursor ring when the cursor changes.

Requires a companion change in frameworks/base

Change-Id: I309abe346f6b67ed3b665aaa79c367f4599bf1cd
http://b/2135321

1 files changed, 1 insertions, 10 deletions

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;
 };
 
 }