Title: [204812] releases/WebKitGTK/webkit-2.12/Source/WebKit2
- Revision
- 204812
- Author
- [email protected]
- Date
- 2016-08-23 04:40:19 -0700 (Tue, 23 Aug 2016)
Log Message
Merge r202801 - [GTK] ASSERTION_FAILED: m_key != PTHREAD_KEYS_MAX when defining WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH
https://bugs.webkit.org/show_bug.cgi?id=158149
Patch by Fujii Hironori <[email protected]> on 2016-07-04
Reviewed by Carlos Garcia Campos.
WTF::sleep can not be used at the beginning of web process because
WTF is not initialized at the moment yet.
* WebProcess/gtk/WebProcessMainGtk.cpp: Use g_usleep instead of WTF::sleep.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (204811 => 204812)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-08-23 11:38:32 UTC (rev 204811)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-08-23 11:40:19 UTC (rev 204812)
@@ -1,3 +1,15 @@
+2016-07-04 Fujii Hironori <[email protected]>
+
+ [GTK] ASSERTION_FAILED: m_key != PTHREAD_KEYS_MAX when defining WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH
+ https://bugs.webkit.org/show_bug.cgi?id=158149
+
+ Reviewed by Carlos Garcia Campos.
+
+ WTF::sleep can not be used at the beginning of web process because
+ WTF is not initialized at the moment yet.
+
+ * WebProcess/gtk/WebProcessMainGtk.cpp: Use g_usleep instead of WTF::sleep.
+
2016-06-10 Carlos Garcia Campos <[email protected]>
[GTK] Browser plugins crash under Wayland
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp (204811 => 204812)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2016-08-23 11:38:32 UTC (rev 204811)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2016-08-23 11:40:19 UTC (rev 204812)
@@ -48,7 +48,7 @@
{
#ifndef NDEBUG
if (g_getenv("WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH"))
- sleep(30);
+ g_usleep(30 * G_USEC_PER_SEC);
#endif
#if (USE(COORDINATED_GRAPHICS_THREADED) || USE(GSTREAMER_GL)) && PLATFORM(X11)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
