diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 04:26:11 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 04:26:11 +0000 |
| commit | 1e57cab1ea720cd4126c398c18771df5e099e196 (patch) | |
| tree | 3c60431f000890b1bf90589db850c7ce0577f0f8 /content/shell/webkit_test_controller.cc | |
| parent | 39c36df426e55c3705c138b0596a59e976aa728f (diff) | |
| download | chromium_src-1e57cab1ea720cd4126c398c18771df5e099e196.zip chromium_src-1e57cab1ea720cd4126c398c18771df5e099e196.tar.gz chromium_src-1e57cab1ea720cd4126c398c18771df5e099e196.tar.bz2 | |
[content shell] add support for running headless on mac
BUG=111316
Review URL: https://chromiumcodereview.appspot.com/15702006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/webkit_test_controller.cc')
| -rw-r--r-- | content/shell/webkit_test_controller.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc index 7239ed1..a07c83e 100644 --- a/content/shell/webkit_test_controller.cc +++ b/content/shell/webkit_test_controller.cc @@ -38,9 +38,6 @@ const int kTestTimeoutMilliseconds = 30 * 1000; // 0x20000000ms is big enough for the purpose to avoid timeout in debugging. const int kCloseEnoughToInfinity = 0x20000000; -const int kTestWindowWidthDip = 800; -const int kTestWindowHeightDip = 600; - const int kTestSVGWindowWidthDip = 480; const int kTestSVGWindowHeightDip = 360; @@ -210,7 +207,8 @@ bool WebKitTestController::PrepareForLayoutTest( ShellContentBrowserClient::Get()->browser_context(); if (test_url.spec().find("compositing/") != std::string::npos) is_compositing_test_ = true; - initial_size_ = gfx::Size(kTestWindowWidthDip, kTestWindowHeightDip); + initial_size_ = gfx::Size( + Shell::kDefaultTestWindowWidthDip, Shell::kDefaultTestWindowHeightDip); // The W3C SVG layout tests use a different size than the other layout tests. if (test_url.spec().find("W3C-SVG-1.1") != std::string::npos) initial_size_ = gfx::Size(kTestSVGWindowWidthDip, kTestSVGWindowHeightDip); |