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

am b6ddc7ae: Notify native plugin code when the browser discards the customView.

Browse Source 
Merge commit 'b6ddc7ae3507f0e1ea9a76c76f829bc8b26a292c' into eclair-mr2-plus-aosp

* commit 'b6ddc7ae3507f0e1ea9a76c76f829bc8b26a292c':
  Notify native plugin code when the browser discards the customView.
This commit is contained in:
Derek Sollenberger
2009-12-14 06:11:05 -08:00
committed by Android Git Automerger
parent acd295776f b6ddc7ae35
commit 80a1335049
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/CallbackProxy.java
View File

@@ -1410,7 +1410,7 @@ class CallbackProxy extends Handler {
return;
}
Message msg = obtainMessage(SHOW_CUSTOM_VIEW);
HashMap<String, Object> map = new HashMap();
HashMap<String, Object> map = new HashMap<String, Object>();
map.put("view", view);
map.put("callback", callback);
msg.obj = map;

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

@@ -2207,7 +2207,7 @@ final class WebViewCore {
// called by JNI. PluginWidget function to launch a full-screen view using a
// View object provided by the plugin class.
private void showFullScreenPlugin(WebkitPlugin webkitPlugin) {
private void showFullScreenPlugin(WebkitPlugin webkitPlugin, final int npp) {
if (mWebView == null) {
return;
}
@@ -2222,6 +2222,7 @@ final class WebViewCore {
public void onCustomViewHidden() {
if (surface != null) {
surface.onSurfaceRemoved();
nativeFullScreenPluginHidden(npp);
}
}
};
@@ -2273,4 +2274,5 @@ final class WebViewCore {
private native void nativePause();
private native void nativeResume();
private native void nativeFreeMemory();
private native void nativeFullScreenPluginHidden(int npp);
}