Title: [199658] trunk/Source/WebKit2
- Revision
- 199658
- Author
- carlo...@webkit.org
- Date
- 2016-04-18 01:31:11 -0700 (Mon, 18 Apr 2016)
Log Message
[UNIX] Initialize WebKit before the platform initializations
https://bugs.webkit.org/show_bug.cgi?id=156622
Reviewed by Michael Catanzaro.
The platform specific initialization might use something that would require WebKit2 to be initialized. For
example, in debug mode, the GTK+ port uses WTF::sleep that requires the threading to be initialized.
* Shared/unix/ChildProcessMain.h:
(WebKit::ChildProcessMain): Move InitializeWebKit2() before platformInitialize().
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (199657 => 199658)
--- trunk/Source/WebKit2/ChangeLog 2016-04-18 08:20:08 UTC (rev 199657)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-18 08:31:11 UTC (rev 199658)
@@ -1,3 +1,16 @@
+2016-04-18 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [UNIX] Initialize WebKit before the platform initializations
+ https://bugs.webkit.org/show_bug.cgi?id=156622
+
+ Reviewed by Michael Catanzaro.
+
+ The platform specific initialization might use something that would require WebKit2 to be initialized. For
+ example, in debug mode, the GTK+ port uses WTF::sleep that requires the threading to be initialized.
+
+ * Shared/unix/ChildProcessMain.h:
+ (WebKit::ChildProcessMain): Move InitializeWebKit2() before platformInitialize().
+
2016-04-18 Jeremy Huddleston Sequoia <jerem...@apple.com>
Fix incorrect assumption that APPLE implies Mac.
Modified: trunk/Source/WebKit2/Shared/unix/ChildProcessMain.h (199657 => 199658)
--- trunk/Source/WebKit2/Shared/unix/ChildProcessMain.h 2016-04-18 08:20:08 UTC (rev 199657)
+++ trunk/Source/WebKit2/Shared/unix/ChildProcessMain.h 2016-04-18 08:31:11 UTC (rev 199658)
@@ -49,11 +49,11 @@
{
ChildProcessMainType childMain;
+ InitializeWebKit2();
+
if (!childMain.platformInitialize())
return EXIT_FAILURE;
- InitializeWebKit2();
-
if (!childMain.parseCommandLine(argc, argv))
return EXIT_FAILURE;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes