Title: [89865] trunk/Source/WebKit2
- Revision
- 89865
- Author
- [email protected]
- Date
- 2011-06-27 15:11:19 -0700 (Mon, 27 Jun 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (89864 => 89865)
--- trunk/Source/WebKit2/ChangeLog 2011-06-27 22:01:38 UTC (rev 89864)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-27 22:11:19 UTC (rev 89865)
@@ -1,3 +1,17 @@
+2011-06-27 Jeff Miller <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Kenneth Rohde Christiansen.
Modified: trunk/Source/WebKit2/WebProcess/WebKitMain.cpp (89864 => 89865)
--- trunk/Source/WebKit2/WebProcess/WebKitMain.cpp 2011-06-27 22:01:38 UTC (rev 89864)
+++ trunk/Source/WebKit2/WebProcess/WebKitMain.cpp 2011-06-27 22:11:19 UTC (rev 89865)
@@ -150,7 +150,7 @@
// Show an alert when Ctrl-Alt-Shift is held down during launch to give the user time to attach a
// 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;
wchar_t path[MAX_PATH];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
