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

Commit a6c4d8e0 authored by Jonathan Dixon's avatar Jonathan Dixon
Browse files

Rename getWebView() to getWebViewClassic 

Interdepends on https://android-git.corp.google.com/g/170037
Tidys up a TODO from my webview proxy patch.
This allows me to re-introduce getWebView(), but now returning the
actual WebView instance which is needed by my upcoming change to WebKit
linked above.
Also moves sendPluginDrawMsg() to WebViewCore for convenience in the
MediaTexture code that calls this.

Change-Id: I57b72504a792de58d15f386abf4a9d821449ab0a
parent cdbf5667

core/java/android/webkit/BrowserFrame.java

+2 −2
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ class BrowserFrame extends Handler { 
        // loadType is not used yet

        if (isMainFrame) {

            mCommitted = true;

            mWebViewCore.getWebView().mViewManager.postResetStateAll();

            mWebViewCore.getWebViewClassic().mViewManager.postResetStateAll();

        }

    }
@@ -910,7 +910,7 @@ class BrowserFrame extends Handler { 
     * Close this frame and window.

     */

    private void closeWindow(WebViewCore w) {

        mCallbackProxy.onCloseWindow(w.getWebView());

        mCallbackProxy.onCloseWindow(w.getWebViewClassic());

    }



    // XXX: Must match PolicyAction in FrameLoaderTypes.h in webcore

core/java/android/webkit/HTML5Audio.java

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ class HTML5Audio extends Handler 
        resetMediaPlayer();

        mContext = webViewCore.getContext();

        mIsPrivateBrowsingEnabledGetter = new IsPrivateBrowsingEnabledGetter(

                webViewCore.getContext().getMainLooper(), webViewCore.getWebView());

                webViewCore.getContext().getMainLooper(), webViewCore.getWebViewClassic());

    }



    private void resetMediaPlayer() {

core/java/android/webkit/HTML5VideoViewProxy.java

+1 −1
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ class HTML5VideoViewProxy extends Handler 
     * @return a new HTML5VideoViewProxy object.

     */

    public static HTML5VideoViewProxy getInstance(WebViewCore webViewCore, int nativePtr) {

        return new HTML5VideoViewProxy(webViewCore.getWebView(), nativePtr);

        return new HTML5VideoViewProxy(webViewCore.getWebViewClassic(), nativePtr);

    }



    /* package */ WebViewClassic getWebView() {

core/java/android/webkit/WebViewClassic.java

+0 −4
Original line number Diff line number Diff line
@@ -7299,10 +7299,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
        }

    }



    void sendPluginDrawMsg() {

        mWebViewCore.sendMessage(EventHub.PLUGIN_SURFACE_READY);

    }



    /*

     * Return true if the rect (e.g. plugin) is fully visible and maximized

     * inside the WebView.

core/java/android/webkit/WebViewCore.java

+110 −96

File changed.

Preview size limit exceeded, changes collapsed.