Title: [221007] trunk/Source/WebKit
- Revision
- 221007
- Author
- [email protected]
- Date
- 2017-08-22 02:13:47 -0700 (Tue, 22 Aug 2017)
Log Message
[GTK][WPE] Rename StorageProcessMainGtk.cpp to StorageProcessMainGLib.cpp
https://bugs.webkit.org/show_bug.cgi?id=175814
Reviewed by Gyuyoung Kim.
Both GTK+ and WPE ports already compile the StorageProcessMainGtk.cpp
file, but it should be renamed to StorageProcessMainGLib and moved into
the StorageProcess/glib/ directory.
* PlatformGTK.cmake:
* PlatformWPE.cmake:
* StorageProcess/glib/StorageProcessMainGLib.cpp: Renamed from Source/WebKit/StorageProcess/gtk/StorageProcessMainGtk.cpp.
Modified Paths
Added Paths
Removed Paths
- trunk/Source/WebKit/StorageProcess/gtk/
Diff
Modified: trunk/Source/WebKit/ChangeLog (221006 => 221007)
--- trunk/Source/WebKit/ChangeLog 2017-08-22 08:44:36 UTC (rev 221006)
+++ trunk/Source/WebKit/ChangeLog 2017-08-22 09:13:47 UTC (rev 221007)
@@ -1,3 +1,18 @@
+2017-08-22 Zan Dobersek <[email protected]>
+
+ [GTK][WPE] Rename StorageProcessMainGtk.cpp to StorageProcessMainGLib.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=175814
+
+ Reviewed by Gyuyoung Kim.
+
+ Both GTK+ and WPE ports already compile the StorageProcessMainGtk.cpp
+ file, but it should be renamed to StorageProcessMainGLib and moved into
+ the StorageProcess/glib/ directory.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+ * StorageProcess/glib/StorageProcessMainGLib.cpp: Renamed from Source/WebKit/StorageProcess/gtk/StorageProcessMainGtk.cpp.
+
2017-08-21 Zan Dobersek <[email protected]>
[WK] Add missing ENABLE(NETWORK_CACHE) build guards
Modified: trunk/Source/WebKit/PlatformGTK.cmake (221006 => 221007)
--- trunk/Source/WebKit/PlatformGTK.cmake 2017-08-22 08:44:36 UTC (rev 221006)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2017-08-22 09:13:47 UTC (rev 221007)
@@ -99,7 +99,7 @@
Shared/unix/ChildProcessMain.cpp
- StorageProcess/gtk/StorageProcessMainGtk.cpp
+ StorageProcess/glib/StorageProcessMainGLib.cpp
UIProcess/AcceleratedDrawingAreaProxy.cpp
UIProcess/BackingStore.cpp
Modified: trunk/Source/WebKit/PlatformWPE.cmake (221006 => 221007)
--- trunk/Source/WebKit/PlatformWPE.cmake 2017-08-22 08:44:36 UTC (rev 221006)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2017-08-22 09:13:47 UTC (rev 221007)
@@ -120,6 +120,8 @@
Shared/wpe/ProcessExecutablePathWPE.cpp
Shared/wpe/WebEventFactory.cpp
+ StorageProcess/glib/StorageProcessMainGLib.cpp
+
UIProcess/AcceleratedDrawingAreaProxy.cpp
UIProcess/BackingStore.cpp
UIProcess/DefaultUndoController.cpp
@@ -261,9 +263,6 @@
WebProcess/soup/WebProcessSoup.cpp
WebProcess/wpe/WebProcessMainWPE.cpp
-
- # FIXME-GWSHARE:
- StorageProcess/gtk/StorageProcessMainGtk.cpp
)
list(APPEND WebKit2_MESSAGES_IN_FILES
Added: trunk/Source/WebKit/StorageProcess/glib/StorageProcessMainGLib.cpp (0 => 221007)
--- trunk/Source/WebKit/StorageProcess/glib/StorageProcessMainGLib.cpp (rev 0)
+++ trunk/Source/WebKit/StorageProcess/glib/StorageProcessMainGLib.cpp 2017-08-22 09:13:47 UTC (rev 221007)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2015 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "StorageProcessMainUnix.h"
+
+#include "ChildProcessMain.h"
+#include "StorageProcess.h"
+
+namespace WebKit {
+
+int StorageProcessMainUnix(int argc, char** argv)
+{
+ return ChildProcessMain<StorageProcess, ChildProcessMainBase>(argc, argv);
+}
+
+} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
