Changeset 89865 in webkit

Timestamp:

Jun 27, 2011 3:11:19 PM (13 years ago)

Author:

jeffm@apple.com

Message:

Web process always pauses on launch
​https://bugs.webkit.org/show_bug.cgi?id=63487

Reviewed by Oliver Hunt.

In the absence of the WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH environment variable, only pause the web process on
launch if the shift, control, and alt keys are all held down. This regressed in r89865, which always caused the
web process to pause if the shift and alt keys were not held down.

• WebProcess/WebKitMain.cpp:

(pauseProcessIfNeeded): Add some parentheses.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebKitMain.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-27  Jeff Miller  <jeffm@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Web process always pauses on launch
+        https://bugs.webkit.org/show_bug.cgi?id=63487
+        
+        In the absence of the WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH environment variable, only pause the web process on
+        launch if the shift, control, and alt keys are all held down. This regressed in r89865, which always caused the
+        web process to pause if the shift and alt keys were not held down.
+
+        * WebProcess/WebKitMain.cpp:
+        (pauseProcessIfNeeded): Add some parentheses.
+
 2011-06-27  Huang Dongsung  <luxtella@company100.net>
 

trunk/Source/WebKit2/WebProcess/WebKitMain.cpp

@@ -151 +151 @@
     // debugger. This is useful for debugging problems that happen early in the web process's lifetime.
     const unsigned short highBitMaskShort = 0x8000;
-    if (!getenv("WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH") && !(::GetKeyState(VK_CONTROL) & highBitMaskShort) && (::GetKeyState(VK_MENU) & highBitMaskShort) && (::GetKeyState(VK_SHIFT) & highBitMaskShort))
+    if (!getenv("WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH") && !((::GetKeyState(VK_CONTROL) & highBitMaskShort) && (::GetKeyState(VK_MENU) & highBitMaskShort) && (::GetKeyState(VK_SHIFT) & highBitMaskShort)))
         return;