summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell_switches.cc
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-14 21:19:21 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-14 21:19:21 +0000
commitcf37da383867e81a5998fb06f5bca52dc92552c7 (patch)
treef5cd435729061d74f739cadd0d51a09019c849c2 /webkit/tools/test_shell/test_shell_switches.cc
parenta1b9f5d1be682acc27767c121e282b2353510b48 (diff)
downloadchromium_src-cf37da383867e81a5998fb06f5bca52dc92552c7.zip
chromium_src-cf37da383867e81a5998fb06f5bca52dc92552c7.tar.gz
chromium_src-cf37da383867e81a5998fb06f5bca52dc92552c7.tar.bz2
This change adds a new "generic" theme to the Windows implementation of
test_shell, so that we can render controls in a platform-verion-independent manner, allowing us to use (almost) a single set of baselines for all versions of Windows. test_shell is modified to accept three new switches: --ux-theme (for the default or "new" XP/Vista theming engine), --classic-theme (for the older "Classic" theming engine), and --generic-theme (for the new Skia-based test theme). Specifying --layout-tests will default to --classic-theme, otherwise --ux-theme is the default (this is compatible with existing test_shell behavior). Once the new version-independent baselines are checked in, we will flip this behavior so --layout-tests defaults to --generic-theme as well. This change adds test_shell_webtheme{engine,control}.{cc,h} as Windows-only build files, and adds documentation to webkit/api/public/win/WebThemeEngine. It also adds a chromium-win-xp platform baseline directory (currently empty) and modifies the layout_test/layout_package/platform_utils_win.py baseline search path to confirm to WebKit's directory search logic (vista and win7 look just in chromium-win, but XP looks in chromium-win-xp first, followed by chromium-win). BUG=none R=darin,pkasting TEST=none Review URL: http://codereview.chromium.org/192021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_switches.cc')
-rw-r--r--webkit/tools/test_shell/test_shell_switches.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index 0884929..26a79cb 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -14,6 +14,17 @@ const wchar_t kNoErrorDialogs[] = L"noerrdialogs";
const wchar_t kLayoutTests[] = L"layout-tests";
const wchar_t kCrashDumps[] = L"crash-dumps"; // Enable crash dumps
+// Causes the test_shell to run with a generic theme (part of layout_tests).
+const wchar_t kGenericTheme[] = L"generic-theme";
+
+// This causes the test_shell to run with the classic theme.
+// Passing --layout-tests enables this by default.
+const wchar_t kClassicTheme[] = L"classic-theme";
+
+// This causes the test_shell to run with the new windows theming engine
+// enabled. This is the default unless --layout-tests is specified.
+const wchar_t kUxTheme[] = L"ux-theme";
+
// Command line flags that control the tests when layout-tests is specified.
const wchar_t kNoTree[] = L"notree"; // Don't dump the render tree.
const wchar_t kDumpPixels[] = L"pixel-tests"; // Enable pixel tests.