summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 12:39:27 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 12:39:27 +0000
commitf3c0d55cdfb75cb0f8600777d5a6bcf9caa3bfbf (patch)
tree33859a8a18093c669015a0ca0131340224fcaf27 /webkit
parent9ee2250c45c0e1a42fa57545048693a4e0fe5fbf (diff)
downloadchromium_src-f3c0d55cdfb75cb0f8600777d5a6bcf9caa3bfbf.zip
chromium_src-f3c0d55cdfb75cb0f8600777d5a6bcf9caa3bfbf.tar.gz
chromium_src-f3c0d55cdfb75cb0f8600777d5a6bcf9caa3bfbf.tar.bz2
Don't navigate TestShell page to about:blank if it's devtools frontend because it is supposed to load only devtools frontend page and only once.
Review URL: http://codereview.chromium.org/1600007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index c9f5170..ba3a2c2 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -144,9 +144,13 @@ TestShell::TestShell()
TestShell::~TestShell() {
delegate_->RevokeDragDrop();
- // Navigate to an empty page to fire all the destruction logic for the
- // current page.
- LoadURL(GURL("about:blank"));
+ // DevTools frontend page is supposed to be navigated only once and
+ // loading another URL in that Page is an error.
+ if (!dev_tools_client_.get()) {
+ // Navigate to an empty page to fire all the destruction logic for the
+ // current page.
+ LoadURL(GURL("about:blank"));
+ }
// Call GC twice to clean up garbage.
CallJSGC();