diff options
| author | Patrick Scott <phanna@android.com> | 2010-06-16 12:27:06 -0400 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-26 14:05:21 -0700 |
| commit | 35e719794b9055a79a997f8a506cef9243240e6c (patch) | |
| tree | 784cb6a02373f4767138cb2c81f121c6ba5f7d3d /core/java/android/webkit/BrowserFrame.java | |
| parent | f3ee6f87a344b185d8bde12c77440c9020378510 (diff) | |
Fix a monkey crash when the new WebView is destroyed.
Grab the WebViewCore immediately so that if the Tab is destroyed, we have the
old WebViewCore object and can return the BrowserFrame.
Bug: 2733004
Change-Id: Ic3e4c5417f2165f412f60f05aea3ed403d8cecfd
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 219a469c2de9..a2c80f265c7d 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -785,11 +785,7 @@ class BrowserFrame extends Handler { * @return The BrowserFrame object stored in the new WebView. */ private BrowserFrame createWindow(boolean dialog, boolean userGesture) { - WebView w = mCallbackProxy.createWindow(dialog, userGesture); - if (w != null) { - return w.getWebViewCore().getBrowserFrame(); - } - return null; + return mCallbackProxy.createWindow(dialog, userGesture); } /** |