Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (221252 => 221253)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-08-28 13:30:20 UTC (rev 221252)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-08-28 13:38:28 UTC (rev 221253)
@@ -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 Charlie Turner <[email protected]>
MemoryCache::setCapacities assertion failure maxDeadBytes <= totalBytes
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/PlatformGTK.cmake (221252 => 221253)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/PlatformGTK.cmake 2017-08-28 13:30:20 UTC (rev 221252)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/PlatformGTK.cmake 2017-08-28 13:38:28 UTC (rev 221253)
@@ -99,7 +99,7 @@
Shared/unix/ChildProcessMain.cpp
- StorageProcess/gtk/StorageProcessMainGtk.cpp
+ StorageProcess/glib/StorageProcessMainGLib.cpp
UIProcess/AcceleratedDrawingAreaProxy.cpp
UIProcess/BackingStore.cpp
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/PlatformWPE.cmake (221252 => 221253)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/PlatformWPE.cmake 2017-08-28 13:30:20 UTC (rev 221252)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/PlatformWPE.cmake 2017-08-28 13:38:28 UTC (rev 221253)
@@ -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
Copied: releases/WebKitGTK/webkit-2.18/Source/WebKit/StorageProcess/glib/StorageProcessMainGLib.cpp (from rev 221252, releases/WebKitGTK/webkit-2.18/Source/WebKit/StorageProcess/gtk/StorageProcessMainGtk.cpp) (0 => 221253)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/StorageProcess/glib/StorageProcessMainGLib.cpp (rev 0)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/StorageProcess/glib/StorageProcessMainGLib.cpp 2017-08-28 13:38:28 UTC (rev 221253)
@@ -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
Deleted: releases/WebKitGTK/webkit-2.18/Source/WebKit/StorageProcess/gtk/StorageProcessMainGtk.cpp (221252 => 221253)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/StorageProcess/gtk/StorageProcessMainGtk.cpp 2017-08-28 13:30:20 UTC (rev 221252)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/StorageProcess/gtk/StorageProcessMainGtk.cpp 2017-08-28 13:38:28 UTC (rev 221253)
@@ -1,39 +0,0 @@
-/*
- * 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
