- Revision
- 200233
- Author
- [email protected]
- Date
- 2016-04-29 00:46:11 -0700 (Fri, 29 Apr 2016)
Log Message
[GTK] Move WK2 shareable code out from gtk directories
https://bugs.webkit.org/show_bug.cgi?id=157135
Reviewed by Darin Adler.
Both NetworkProcessMain and InjectedBundle can go out from their respective gtk directories.
* NetworkProcess/gtk/NetworkProcessMainGtk.cpp:
(WebKit::NetworkProcessMainUnix): Deleted.
* NetworkProcess/soup/NetworkProcessMainSoup.cpp: Renamed from Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp.
(WebKit::NetworkProcessMainUnix):
* PlatformGTK.cmake: Update.
* WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp: Renamed from Source/WebKit2/WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp.
(WebKit::InjectedBundle::initialize):
(WebKit::InjectedBundle::setBundleParameter):
(WebKit::InjectedBundle::setBundleParameters):
* WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp:
(WebKit::InjectedBundle::initialize): Deleted.
(WebKit::InjectedBundle::setBundleParameter): Deleted.
(WebKit::InjectedBundle::setBundleParameters): Deleted.
Modified Paths
Added Paths
Removed Paths
- trunk/Source/WebKit2/NetworkProcess/gtk/
- trunk/Source/WebKit2/WebProcess/InjectedBundle/gtk/
Diff
Modified: trunk/Source/WebKit2/ChangeLog (200232 => 200233)
--- trunk/Source/WebKit2/ChangeLog 2016-04-29 07:33:02 UTC (rev 200232)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-29 07:46:11 UTC (rev 200233)
@@ -1,3 +1,26 @@
+2016-04-29 Claudio Saavedra <[email protected]>
+
+ [GTK] Move WK2 shareable code out from gtk directories
+ https://bugs.webkit.org/show_bug.cgi?id=157135
+
+ Reviewed by Darin Adler.
+
+ Both NetworkProcessMain and InjectedBundle can go out from their respective gtk directories.
+
+ * NetworkProcess/gtk/NetworkProcessMainGtk.cpp:
+ (WebKit::NetworkProcessMainUnix): Deleted.
+ * NetworkProcess/soup/NetworkProcessMainSoup.cpp: Renamed from Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp.
+ (WebKit::NetworkProcessMainUnix):
+ * PlatformGTK.cmake: Update.
+ * WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp: Renamed from Source/WebKit2/WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp.
+ (WebKit::InjectedBundle::initialize):
+ (WebKit::InjectedBundle::setBundleParameter):
+ (WebKit::InjectedBundle::setBundleParameters):
+ * WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp:
+ (WebKit::InjectedBundle::initialize): Deleted.
+ (WebKit::InjectedBundle::setBundleParameter): Deleted.
+ (WebKit::InjectedBundle::setBundleParameters): Deleted.
+
2016-04-28 Dean Jackson <[email protected]>
RTL <select> popup menu is in the wrong location
Copied: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessMainSoup.cpp (from rev 200232, trunk/Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp) (0 => 200233)
--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessMainSoup.cpp (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessMainSoup.cpp 2016-04-29 07:46:11 UTC (rev 200233)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2014 Igalia S.L.
+ * Copyright (C) 2013 Company 100 Inc.
+ *
+ * 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 THE COPYRIGHT HOLDERS ``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 "NetworkProcess.h"
+
+#include "ChildProcessMain.h"
+#include "NetworkProcessMainUnix.h"
+#include <WebCore/SoupNetworkSession.h>
+#include <libsoup/soup.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+class NetworkProcessMain final: public ChildProcessMainBase {
+public:
+ bool platformInitialize() override
+ {
+ SoupNetworkSession::defaultSession().setSSLPolicy(SoupNetworkSession::SSLUseSystemCAFile);
+ return true;
+ }
+};
+
+int NetworkProcessMainUnix(int argc, char** argv)
+{
+ return ChildProcessMain<NetworkProcess, NetworkProcessMain>(argc, argv);
+}
+
+} // namespace WebKit
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (200232 => 200233)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-04-29 07:33:02 UTC (rev 200232)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-04-29 07:46:11 UTC (rev 200233)
@@ -37,8 +37,7 @@
NetworkProcess/cache/NetworkCacheDataSoup.cpp
NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp
- NetworkProcess/gtk/NetworkProcessMainGtk.cpp
-
+ NetworkProcess/soup/NetworkProcessMainSoup.cpp
NetworkProcess/soup/NetworkProcessSoup.cpp
NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
@@ -332,7 +331,7 @@
WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp
WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp
- WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp
+ WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp
WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
Copied: trunk/Source/WebKit2/WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp (from rev 200232, trunk/Source/WebKit2/WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp) (0 => 200233)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp 2016-04-29 07:46:11 UTC (rev 200233)
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
+ *
+ * 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 "InjectedBundle.h"
+
+#include "WKBundleAPICast.h"
+#include "WKBundleInitialize.h"
+#include <WebCore/FileSystem.h>
+#include <wtf/text/CString.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+bool InjectedBundle::initialize(const WebProcessCreationParameters&, API::Object* initializationUserData)
+{
+ m_platformBundle = g_module_open(fileSystemRepresentation(m_path).data(), G_MODULE_BIND_LOCAL);
+ if (!m_platformBundle) {
+ g_warning("Error loading the injected bundle (%s): %s", m_path.utf8().data(), g_module_error());
+ return false;
+ }
+
+ WKBundleInitializeFunctionPtr initializeFunction = 0;
+ if (!g_module_symbol(m_platformBundle, "WKBundleInitialize", reinterpret_cast<void**>(&initializeFunction)) || !initializeFunction) {
+ g_warning("Error loading WKBundleInitialize symbol from injected bundle.");
+ return false;
+ }
+
+ initializeFunction(toAPI(this), toAPI(initializationUserData));
+ return true;
+}
+
+void InjectedBundle::setBundleParameter(WTF::String const&, IPC::DataReference const&)
+{
+}
+
+void InjectedBundle::setBundleParameters(const IPC::DataReference&)
+{
+}
+
+} // namespace WebKit
