diff options
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index e8a66c1..2667520 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -670,7 +670,12 @@ public class TestShellActivity extends Activity implements LayoutTestController public boolean onCreateWindow(WebView view, boolean dialog, boolean userGesture, Message resultMsg) { if (!mCanOpenWindows) { - return false; + // We can't open windows, so just send null back. + WebView.WebViewTransport transport = + (WebView.WebViewTransport) resultMsg.obj; + transport.setWebView(null); + resultMsg.sendToTarget(); + return true; } // We never display the new window, just create the view and @@ -688,6 +693,11 @@ public class TestShellActivity extends Activity implements LayoutTestController resultMsg.sendToTarget(); return true; } + + @Override + public void onCloseWindow(WebView view) { + view.destroy(); + } }; private static class NewWindowWebView extends WebView { |