diff options
| author | Ben Murdoch <benm@google.com> | 2011-02-01 18:42:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-01 18:42:12 -0800 |
| commit | c5f520aa09b75b53d212e9c23b488a343e89751f (patch) | |
| tree | 6de80790c94726b435e23d1ab4e26ac7880c3188 | |
| parent | e776768b269a23b33974e72c691321cc2f2d5adf (diff) | |
| parent | 6a48ba740e8d93c945ce7d829a25de2b004d0452 (diff) | |
| download | frameworks_base-c5f520aa09b75b53d212e9c23b488a343e89751f.zip frameworks_base-c5f520aa09b75b53d212e9c23b488a343e89751f.tar.gz frameworks_base-c5f520aa09b75b53d212e9c23b488a343e89751f.tar.bz2 | |
am 6a48ba74: am 3b8657de: Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb
* commit '6a48ba740e8d93c945ce7d829a25de2b004d0452':
Move setExpandedTileBounds from WC to UI thread
| -rw-r--r-- | core/java/android/webkit/WebView.java | 4 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index cc34b26..fa99eae 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -8161,7 +8161,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); } /** @@ -8320,6 +8320,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 60069f5..b410699 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -582,8 +582,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 @@ -1005,8 +1003,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; @@ -1566,10 +1562,6 @@ final class WebViewCore { mWebView.mPrivateHandler.obtainMessage(WebView.AUTOFILL_COMPLETE, null) .sendToTarget(); break; - - case EventHub.SET_EXPANDED_TILE_BOUNDS: - nativeSetExpandedTileBounds(msg.arg1 == 1); - break; } } }; |