[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 9c585bbdefbf2b0b2207b2c97220f1edd03d16fe
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 21:55:50 2010 +0000

    Make the web process break into the debugger when Ctrl-Alt-Shift is held during launch
    
    Fixes <http://webkit.org/b/42670> Would like a way to break into the
    debugger when the web process launches
    
    Reviewed by Anders Carlsson.
    
    * WebProcess/WebKitMain.cpp:
    (WebKitMain): If the Control, Alt, and Shift keys are held down in a
    Debug build, call DebugBreak() so that we will break into the
    debugger.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63777 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b22ae3f..8f53360 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,20 @@
 2010-07-20  Adam Roben  <aroben at apple.com>
 
+        Make the web process break into the debugger when Ctrl-Alt-Shift is
+        held during launch
+
+        Fixes <http://webkit.org/b/42670> Would like a way to break into the
+        debugger when the web process launches
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/WebKitMain.cpp:
+        (WebKitMain): If the Control, Alt, and Shift keys are held down in a
+        Debug build, call DebugBreak() so that we will break into the
+        debugger.
+
+2010-07-20  Adam Roben  <aroben at apple.com>
+
         Teach Connection how to handle a slow receiver
 
         Fixes <http://webkit.org/b/42667> Assertion in
diff --git a/WebKit2/WebProcess/WebKitMain.cpp b/WebKit2/WebProcess/WebKitMain.cpp
index 9a4f466..3bb3d9c 100644
--- a/WebKit2/WebProcess/WebKitMain.cpp
+++ b/WebKit2/WebProcess/WebKitMain.cpp
@@ -77,6 +77,14 @@ static void enableTerminationOnHeapCorruption()
 extern "C" __declspec(dllexport) 
 int WebKitMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow)
 {
+#ifndef NDEBUG
+    // Break into the debugger when Ctrl-Alt-Shift is held down during launch. This makes it easier
+    // to debug problems that happen early in the web process's liftime.
+    const unsigned short highBitMaskShort = 0x8000;
+    if ((::GetKeyState(VK_CONTROL) & highBitMaskShort) && (::GetKeyState(VK_MENU) & highBitMaskShort) && (::GetKeyState(VK_SHIFT) & highBitMaskShort))
+        ::DebugBreak();
+#endif
+
     enableTerminationOnHeapCorruption();
 
     CommandLine commandLine;

-- 
WebKit Debian packaging