diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-06-08 11:27:15 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2009-06-09 09:58:13 -0400 |
| commit | 5f0e3b86680e07e8b7027c4b215a0db0a9dc9d18 (patch) | |
| tree | a9d7f4daedd9f23594538f0a3963ab1bdb94c699 /WebCore/platform/graphics/android | |
| parent | a2c69492fd11733119d4f6ce3540acdfee9bf88c (diff) | |
| download | external_webkit-5f0e3b86680e07e8b7027c4b215a0db0a9dc9d18.zip external_webkit-5f0e3b86680e07e8b7027c4b215a0db0a9dc9d18.tar.gz external_webkit-5f0e3b86680e07e8b7027c4b215a0db0a9dc9d18.tar.bz2 | |
Remove obsolete notion of invalid node.
In the old navigation model, we set focus to a node, and checked to see
if that node was still valid (could have changed since we built the
navigation cache). Then we sent a message back to the UI thread to
tell it to draw the ring differently. In the new model, we are essentially
moving a mouse, so we do not concern ourselves with whether the node is
valid. Here I have removed function and jni to call sendMarkNodeInvalid,
the notion of an invalid node in WebView.cpp, and the INVALID flavor
of CursorRing. Needs a change in frameworks/base to work properly.
Diffstat (limited to 'WebCore/platform/graphics/android')
| -rw-r--r-- | WebCore/platform/graphics/android/android_graphics.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/android_graphics.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/android_graphics.cpp b/WebCore/platform/graphics/android/android_graphics.cpp index 10dd5e7..cdd8afe 100644 --- a/WebCore/platform/graphics/android/android_graphics.cpp +++ b/WebCore/platform/graphics/android/android_graphics.cpp @@ -36,7 +36,6 @@ const static SkColor cursorOuterColors[] = { SkColorSetARGB(0xff, 0xB3, 0x3F, 0x08), // normal ring select SkColorSetARGB(0xff, 0x46, 0xb0, 0x00), // fake ring select, for phone, email, text - SkColorSetARGB(0xff, 0xb0, 0x16, 0x00), // invalid ring color SkColorSetARGB(0xff, 0xAD, 0x5C, 0x0A), // normal ring pressed SkColorSetARGB(0xff, 0x36, 0xc0, 0x00) // fake ring pressed }; @@ -44,7 +43,6 @@ const static SkColor cursorOuterColors[] = { const static SkColor cursorInnerColors[] = { SkColorSetARGB(0xff, 0xFE, 0x92, 0x30), // normal ring select SkColorSetARGB(0xff, 0x8c, 0xd9, 0x00), // fake ring select, for phone, email, text - SkColorSetARGB(0xff, 0xd9, 0x2c, 0x00), // invalid ring color SkColorSetARGB(0xff, 0xFE, 0xBD, 0x3A), // normal ring pressed SkColorSetARGB(0xff, 0x7c, 0xe9, 0x00) // fake ring pressed }; diff --git a/WebCore/platform/graphics/android/android_graphics.h b/WebCore/platform/graphics/android/android_graphics.h index d60c10b..348daf1 100644 --- a/WebCore/platform/graphics/android/android_graphics.h +++ b/WebCore/platform/graphics/android/android_graphics.h @@ -52,7 +52,6 @@ public: enum Flavor { NORMAL_FLAVOR, FAKE_FLAVOR, - INVALID_FLAVOR, NORMAL_ANIMATING, FAKE_ANIMATING, ANIMATING_COUNT = 2 |