Skip to content

Commit a6c4d8e

Browse files
author
Jonathan Dixon
committed
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
1 parent cdbf566 commit a6c4d8e

File tree

5 files changed

+114
-104
lines changed

5 files changed

+114
-104
lines changed

core/java/android/webkit/BrowserFrame.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ private void transitionToCommitted(int loadType, boolean isMainFrame) {
448448
// loadType is not used yet
449449
if (isMainFrame) {
450450
mCommitted = true;
451-
mWebViewCore.getWebView().mViewManager.postResetStateAll();
451+
mWebViewCore.getWebViewClassic().mViewManager.postResetStateAll();
452452
}
453453
}
454454

@@ -910,7 +910,7 @@ private void requestFocus() {
910910
* Close this frame and window.
911911
*/
912912
private void closeWindow(WebViewCore w) {
913-
mCallbackProxy.onCloseWindow(w.getWebView());
913+
mCallbackProxy.onCloseWindow(w.getWebViewClassic());
914914
}
915915

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

core/java/android/webkit/HTML5Audio.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public HTML5Audio(WebViewCore webViewCore, int nativePtr) {
183183
resetMediaPlayer();
184184
mContext = webViewCore.getContext();
185185
mIsPrivateBrowsingEnabledGetter = new IsPrivateBrowsingEnabledGetter(
186-
webViewCore.getContext().getMainLooper(), webViewCore.getWebView());
186+
webViewCore.getContext().getMainLooper(), webViewCore.getWebViewClassic());
187187
}
188188

189189
private void resetMediaPlayer() {

core/java/android/webkit/HTML5VideoViewProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ public void exitFullScreenVideo() {
724724
* @return a new HTML5VideoViewProxy object.
725725
*/
726726
public static HTML5VideoViewProxy getInstance(WebViewCore webViewCore, int nativePtr) {
727-
return new HTML5VideoViewProxy(webViewCore.getWebView(), nativePtr);
727+
return new HTML5VideoViewProxy(webViewCore.getWebViewClassic(), nativePtr);
728728
}
729729

730730
/* package */ WebViewClassic getWebView() {

core/java/android/webkit/WebViewClassic.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7299,10 +7299,6 @@ public void run() {
72997299
}
73007300
}
73017301

7302-
void sendPluginDrawMsg() {
7303-
mWebViewCore.sendMessage(EventHub.PLUGIN_SURFACE_READY);
7304-
}
7305-
73067302
/*
73077303
* Return true if the rect (e.g. plugin) is fully visible and maximized
73087304
* inside the WebView.

0 commit comments

Comments
 (0)