summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--WebCore/platform/graphics/android/android_graphics.cpp2
-rw-r--r--WebCore/platform/graphics/android/android_graphics.h1
-rw-r--r--WebKit/android/jni/WebViewCore.cpp10
-rw-r--r--WebKit/android/nav/WebView.cpp30
4 files changed, 6 insertions, 37 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
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 1abb90a..e743acb 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -161,7 +161,6 @@ struct WebViewCore::JavaGlue {
jmethodID m_jsUnload;
jmethodID m_jsInterrupt;
jmethodID m_didFirstLayout;
- jmethodID m_sendMarkNodeInvalid;
jmethodID m_sendNotifyProgressFinished;
jmethodID m_sendViewInvalidate;
jmethodID m_updateTextfield;
@@ -225,7 +224,6 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
m_javaGlue->m_jsUnload = GetJMethod(env, clazz, "jsUnload", "(Ljava/lang/String;Ljava/lang/String;)Z");
m_javaGlue->m_jsInterrupt = GetJMethod(env, clazz, "jsInterrupt", "()Z");
m_javaGlue->m_didFirstLayout = GetJMethod(env, clazz, "didFirstLayout", "(Z)V");
- m_javaGlue->m_sendMarkNodeInvalid = GetJMethod(env, clazz, "sendMarkNodeInvalid", "(I)V");
m_javaGlue->m_sendNotifyProgressFinished = GetJMethod(env, clazz, "sendNotifyProgressFinished", "()V");
m_javaGlue->m_sendViewInvalidate = GetJMethod(env, clazz, "sendViewInvalidate", "(IIII)V");
m_javaGlue->m_updateTextfield = GetJMethod(env, clazz, "updateTextfield", "(IZLjava/lang/String;I)V");
@@ -697,14 +695,6 @@ void WebViewCore::scrollTo(int x, int y, bool animate)
checkException(env);
}
-void WebViewCore::sendMarkNodeInvalid(WebCore::Node* node)
-{
- LOG_ASSERT(m_javaGlue->m_obj, "A Java widget was not associated with this view bridge!");
- JNIEnv* env = JSC::Bindings::getJNIEnv();
- env->CallVoidMethod(m_javaGlue->object(env).get(), m_javaGlue->m_sendMarkNodeInvalid, (int) node);
- checkException(env);
-}
-
void WebViewCore::sendNotifyProgressFinished()
{
LOG_ASSERT(m_javaGlue->m_obj, "A Java widget was not associated with this view bridge!");
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 94c419f..a17847c 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -150,7 +150,6 @@ WebView(JNIEnv* env, jobject javaWebView, int viewImpl)
m_viewImpl = (WebViewCore*) viewImpl;
m_frameCacheUI = 0;
m_navPictureUI = 0;
- m_invalidNode = 0;
m_generation = 0;
m_heightCanMeasure = false;
m_followedLink = false;
@@ -457,10 +456,10 @@ void drawCursorRing(SkCanvas* canvas)
WTF::Vector<WebCore::IntRect> oneRing;
if (!isButton) {
flavor = node->type() != NORMAL_CACHEDNODETYPE ?
- CursorRing::FAKE_FLAVOR : node->nodePointer() == m_invalidNode ?
- CursorRing::INVALID_FLAVOR : CursorRing::NORMAL_FLAVOR;
- if (flavor != CursorRing::INVALID_FLAVOR && m_followedLink) {
- flavor = (CursorRing::Flavor) (flavor + CursorRing::NORMAL_ANIMATING);
+ CursorRing::FAKE_FLAVOR : CursorRing::NORMAL_FLAVOR;
+ if (m_followedLink) {
+ flavor = static_cast<CursorRing::Flavor>
+ (flavor + CursorRing::NORMAL_ANIMATING);
}
bool useHitBounds = node->useHitBounds();
if (useHitBounds || node->useBounds()) {
@@ -472,7 +471,6 @@ void drawCursorRing(SkCanvas* canvas)
DBG_NAV_LOGD("cursorNode=%d (nodePointer=%p) flavor=%s rings=%d"
" (%d, %d, %d, %d)", node->index(), node->nodePointer(),
flavor == CursorRing::FAKE_FLAVOR ? "FAKE_FLAVOR" :
- flavor == CursorRing::INVALID_FLAVOR ? "INVALID_FLAVOR" :
flavor == CursorRing::NORMAL_ANIMATING ? "NORMAL_ANIMATING" :
flavor == CursorRing::FAKE_ANIMATING ? "FAKE_ANIMATING" : "NORMAL_FLAVOR",
rings->size(), ring.x(), ring.y(), ring.width(), ring.height());
@@ -486,7 +484,8 @@ void drawCursorRing(SkCanvas* canvas)
postInvalidateDelayed(m_ringAnimationEnd - time, bounds);
} else {
m_followedLink = false;
- flavor = (CursorRing::Flavor) (flavor - CursorRing::NORMAL_ANIMATING);
+ flavor = static_cast<CursorRing::Flavor>
+ (flavor - CursorRing::NORMAL_ANIMATING);
}
}
if (!isButton)
@@ -782,13 +781,6 @@ void setNavBounds(const WebCore::IntRect& rect)
root->rootHistory()->setNavBounds(rect);
}
-void markNodeInvalid(WebCore::Node* node)
-{
- DBG_NAV_LOGD("node=%p", node);
- m_invalidNode = node;
- viewInvalidate();
-}
-
bool motionUp(int x, int y, int slop)
{
bool pageScrolled = false;
@@ -1177,7 +1169,6 @@ private: // local state for WebView
// private to getFrameCache(); other functions operate in a different thread
CachedRoot* m_frameCacheUI; // navigation data ready for use
WebViewCore* m_viewImpl;
- WebCore::Node* m_invalidNode;
int m_generation; // associate unique ID with sent kit focus to match with ui
SkPicture* m_navPictureUI;
bool m_followedLink;
@@ -1510,13 +1501,6 @@ static jint nativeTextGeneration(JNIEnv *env, jobject obj)
return root ? root->textGeneration() : 0;
}
-static void nativeMarkNodeInvalid(JNIEnv *env, jobject obj, int node)
-{
- WebView* view = GET_NATIVE_VIEW(env, obj);
- LOG_ASSERT(view, "view not set in %s", __FUNCTION__);
- view->markNodeInvalid((WebCore::Node*) node);
-}
-
static bool nativeMotionUp(JNIEnv *env, jobject obj,
int x, int y, int slop)
{
@@ -1809,8 +1793,6 @@ static JNINativeMethod gJavaWebViewMethods[] = {
(void*) nativeImageURI },
{ "nativeInstrumentReport", "()V",
(void*) nativeInstrumentReport },
- { "nativeMarkNodeInvalid", "(I)V",
- (void*) nativeMarkNodeInvalid },
{ "nativeMotionUp", "(III)Z",
(void*) nativeMotionUp },
{ "nativeMoveCursor", "(IIZ)Z",
generated by cgit v1.1 at 2025-08-15 20:25:45 +0000