Title: [210171] releases/WebKitGTK/webkit-2.14/Source/WebKit2
- Revision
- 210171
- Author
- [email protected]
- Date
- 2016-12-27 08:39:27 -0800 (Tue, 27 Dec 2016)
Log Message
Merge r209122 - [GTK] Database process should not initialize gtk
https://bugs.webkit.org/show_bug.cgi?id=165138
Reviewed by Sergio Villar Senin.
It doesn't use GTK+ at all.
* DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp:
(WebKit::DatabaseProcessMainUnix):
(): Deleted.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (210170 => 210171)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-12-27 16:38:19 UTC (rev 210170)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-12-27 16:39:27 UTC (rev 210171)
@@ -1,3 +1,16 @@
+2016-11-29 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Database process should not initialize gtk
+ https://bugs.webkit.org/show_bug.cgi?id=165138
+
+ Reviewed by Sergio Villar Senin.
+
+ It doesn't use GTK+ at all.
+
+ * DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp:
+ (WebKit::DatabaseProcessMainUnix):
+ (): Deleted.
+
2016-11-09 Michael Catanzaro <[email protected]>
Experimental features should not be enabled by default
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp (210170 => 210171)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp 2016-12-27 16:38:19 UTC (rev 210170)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp 2016-12-27 16:39:27 UTC (rev 210171)
@@ -30,24 +30,12 @@
#include "ChildProcessMain.h"
#include "DatabaseProcess.h"
-#include <gtk/gtk.h>
-using namespace WebCore;
-
namespace WebKit {
-class DatabaseProcessMain final: public ChildProcessMainBase {
-public:
- bool platformInitialize() override
- {
- gtk_init(nullptr, nullptr);
- return true;
- }
-};
-
int DatabaseProcessMainUnix(int argc, char** argv)
{
- return ChildProcessMain<DatabaseProcess, DatabaseProcessMain>(argc, argv);
+ return ChildProcessMain<DatabaseProcess, ChildProcessMainBase>(argc, argv);
}
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
