Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb

2 files changed, 3 insertions, 9 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index c84e314975ec..f91ae9f15736 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -8151,7 +8151,7 @@ public class WebView extends AbsoluteLayout
      * @hide only used by the Browser
      */
     public void setExpandedTileBounds(boolean enabled) {
-        mWebViewCore.sendMessage(EventHub.SET_EXPANDED_TILE_BOUNDS, enabled ? 1 : 0, 0);
+        nativeSetExpandedTileBounds(enabled);
     }
 
     /**
@@ -8310,6 +8310,8 @@ public class WebView extends AbsoluteLayout
     static final int NO_LEFTEDGE = -1;
     native int nativeGetBlockLeftEdge(int x, int y, float scale);
 
+    private native void nativeSetExpandedTileBounds(boolean enabled);
+
     // Returns a pointer to the scrollable LayerAndroid at the given point.
     private native int      nativeScrollableLayer(int x, int y, Rect scrollRect,
             Rect scrollBounds);
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 6536e457e0f0..b949a4165f6e 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -578,8 +578,6 @@ final class WebViewCore {
 
     private native void nativeSetJsFlags(String flags);
 
-    private native void nativeSetExpandedTileBounds(boolean enabled);
-
     /**
      *  Delete text from start to end in the focused textfield. If there is no
      *  focus, or if start == end, silently fail.  If start and end are out of
@@ -1001,8 +999,6 @@ final class WebViewCore {
 
         static final int PROXY_CHANGED = 193;
 
-        static final int SET_EXPANDED_TILE_BOUNDS = 194;
-
         // private message ids
         private static final int DESTROY =     200;
 
@@ -1562,10 +1558,6 @@ final class WebViewCore {
                             mWebView.mPrivateHandler.obtainMessage(WebView.AUTOFILL_COMPLETE, null)
                                     .sendToTarget();
                             break;
-
-                        case EventHub.SET_EXPANDED_TILE_BOUNDS:
-                            nativeSetExpandedTileBounds(msg.arg1 == 1);
-                            break;
                     }
                 }
             };