Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3b8657de: Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb

Browse Source 
* commit '3b8657debcbcf1bb4e66ac797d7ea15d737ecb42':
  Move setExpandedTileBounds from WC to UI thread
This commit is contained in:
Ben Murdoch
2011-02-01 18:39:51 -08:00
committed by Android Git Automerger
parent 0872e36ccb 3b8657debc
commit 6a48ba740e
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/WebView.java
View File

@@ -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);

8
core/java/android/webkit/WebViewCore.java
View File

@@ -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;
}
}
};