From 82aa2f5eecddf723af2e4e134de15bbf5c6b32f4 Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Wed, 3 Jun 2009 13:01:32 -0400 Subject: [PATCH] Remove obsolete flags from WebViewCore and WebView Remove NO_FOCUS_CHANGE_BLOCK and BLOCK_FOCUS_CHANGE_UNTIL_KEY_UP, which were part of SET_FINAL_FOCUS (which is no longer used) from WebViewCore. In WebView, do not pass BLOCK_FOCUS_CHANGE_UNTIL_KEY_UP with SET_MOVE_MOUSE, since the receiver does not care about it. --- core/java/android/webkit/WebView.java | 4 +--- core/java/android/webkit/WebViewCore.java | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 9437236e71b23..032c0737d6054 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -3310,9 +3310,7 @@ public class WebView extends AbsoluteLayout // coordinates should be in content coordinates. if (nativeCursorIntersects(visibleRect)) { nativeSetFollowedLink(true); - mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE, - EventHub.BLOCK_FOCUS_CHANGE_UNTIL_KEY_UP, 0, - cursorData()); + mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE, cursorData()); playSoundEffect(SoundEffectConstants.CLICK); return true; } else if (nativeHasCursorNode()) { diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 706e6284e7791..78d0b4de29966 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -658,10 +658,6 @@ final class WebViewCore { // private message ids private static final int DESTROY = 200; - // flag values passed to message SET_FINAL_FOCUS - static final int NO_FOCUS_CHANGE_BLOCK = 0; - static final int BLOCK_FOCUS_CHANGE_UNTIL_KEY_UP = 1; - // Private handler for WebCore messages. private Handler mHandler; // Message queue for containing messages before the WebCore thread is