summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-21 16:00:29 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-21 16:00:29 +0000
commitdb5de6e6dc5b1692f2aa557ab1931246f43b775d (patch)
treef97c03dfbb328dd9e0281b3d6990b82475d3500f
parent760129e63bad89410365f22cda112f4eaee15b3e (diff)
downloadchromium_src-db5de6e6dc5b1692f2aa557ab1931246f43b775d.zip
chromium_src-db5de6e6dc5b1692f2aa557ab1931246f43b775d.tar.gz
chromium_src-db5de6e6dc5b1692f2aa557ab1931246f43b775d.tar.bz2
only resize the window when running layout tests. Makes it easier to use for normal browsing.
Review URL: http://codereview.chromium.org/11566 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5826 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/test_shell/test_shell_gtk.cc7
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm4
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc4
3 files changed, 11 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 4fc4ad5..4776a79 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -451,8 +451,11 @@ void TestShell::LoadURLForFrame(const wchar_t* url,
if (bIsSVGTest)
SizeToSVG();
- else
- SizeToDefault();
+ else {
+ // only resize back to the default when running tests
+ if (!interactive())
+ SizeToDefault();
+ }
std::wstring frame_string;
if (frame_name)
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 92cea42..5975a48 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -523,7 +523,9 @@ void TestShell::LoadURLForFrame(const wchar_t* url,
if (bIsSVGTest) {
SizeTo(kSVGTestWindowWidth, kSVGTestWindowHeight);
} else {
- SizeToDefault();
+ // only resize back to the default when running tests
+ if (!interactive())
+ SizeToDefault();
}
std::string urlString(url8);
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 840b919..eac2e02f 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -546,7 +546,9 @@ void TestShell::LoadURLForFrame(const wchar_t* url,
if (bIsSVGTest) {
SizeToSVG();
} else {
- SizeToDefault();
+ // only resize back to the default when running tests
+ if (!interactive())
+ SizeToDefault();
}
std::wstring urlString(url);