summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell.cc
diff options
context:
space:
mode:
authorsgjesse@chromium.org <sgjesse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 07:46:08 +0000
committersgjesse@chromium.org <sgjesse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 07:46:08 +0000
commitb351289447215f8f9fda9077934d42ae72668a90 (patch)
treeea6328182679fa164e7f776a27dd636864475327 /webkit/tools/test_shell/test_shell.cc
parent305d8c7eab56ac69d8451b47523c9e0bbcdfd8fa (diff)
downloadchromium_src-b351289447215f8f9fda9077934d42ae72668a90.zip
chromium_src-b351289447215f8f9fda9077934d42ae72668a90.tar.gz
chromium_src-b351289447215f8f9fda9077934d42ae72668a90.tar.bz2
Add option --gp-fault-error-box to test shell and run_webkit_tests.py to enable the Windows GP fault dialog. This makes it easier to start debugging the crash in Visual Studio.
Review URL: http://codereview.chromium.org/11273 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.cc')
-rw-r--r--webkit/tools/test_shell/test_shell.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 559ab3f..9d236a6 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -182,15 +182,18 @@ std::string TestShell::DumpImage(WebFrame* web_frame,
// static
void TestShell::InitLogging(bool suppress_error_dialogs,
- bool running_layout_tests) {
+ bool running_layout_tests,
+ bool enable_gp_fault_error_box) {
if (suppress_error_dialogs)
logging::SetLogAssertHandler(UnitTestAssertHandler);
#if defined(OS_WIN)
if (!IsDebuggerPresent()) {
UINT new_flags = SEM_FAILCRITICALERRORS |
- SEM_NOGPFAULTERRORBOX |
SEM_NOOPENFILEERRORBOX;
+ if (!enable_gp_fault_error_box)
+ new_flags |= SEM_NOGPFAULTERRORBOX;
+
// Preserve existing error mode, as discussed at
// http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx
UINT existing_flags = SetErrorMode(new_flags);