Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a500c46 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android Git Automerger
Browse files

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

Merge commit '80a13350'

* commit '80a13350':
  Notify native plugin code when the browser discards the customView.
parents 29dfa243 80a13350

core/java/android/webkit/CallbackProxy.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/webkit/WebViewCore.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

}