Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (241527 => 241528)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-02-14 11:27:24 UTC (rev 241527)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-02-14 11:27:30 UTC (rev 241528)
@@ -1,5 +1,23 @@
2019-02-13 Michael Catanzaro <[email protected]>
+ [WPE][GTK] Merge WebProcessPoolWPE.cpp and WebProcessPoolGtk.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=194551
+
+ Reviewed by Carlos Garcia Campos.
+
+ * SourcesGTK.txt:
+ * SourcesWPE.txt:
+ * UIProcess/glib/WebProcessPoolGLib.cpp: Renamed from Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp.
+ (WebKit::initializeRemoteInspectorServer):
+ (WebKit::memoryPressureMonitorDisabled):
+ (WebKit::WebProcessPool::platformInitialize):
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ (WebKit::WebProcessPool::platformInvalidateContext):
+ (WebKit::WebProcessPool::platformResolvePathsForSandboxExtensions):
+ * UIProcess/wpe/WebProcessPoolWPE.cpp: Removed.
+
+2019-02-13 Michael Catanzaro <[email protected]>
+
Fix -Wformat warning from r241401
https://bugs.webkit.org/show_bug.cgi?id=194584
<rdar://problem/47761293>
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/SourcesGTK.txt (241527 => 241528)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/SourcesGTK.txt 2019-02-14 11:27:24 UTC (rev 241527)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/SourcesGTK.txt 2019-02-14 11:27:30 UTC (rev 241528)
@@ -229,6 +229,7 @@
UIProcess/cairo/BackingStoreCairo.cpp @no-unify
UIProcess/glib/RemoteInspectorClient.cpp
+UIProcess/glib/WebProcessPoolGLib.cpp
UIProcess/glib/WebProcessProxyGLib.cpp
UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp
@@ -255,7 +256,6 @@
UIProcess/gtk/WebPasteboardProxyGtk.cpp
UIProcess/gtk/WebPopupMenuProxyGtk.cpp
UIProcess/gtk/WebPreferencesGtk.cpp
-UIProcess/gtk/WebProcessPoolGtk.cpp @no-unify
UIProcess/soup/WebCookieManagerProxySoup.cpp
UIProcess/soup/WebProcessPoolSoup.cpp
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/SourcesWPE.txt (241527 => 241528)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/SourcesWPE.txt 2019-02-14 11:27:24 UTC (rev 241527)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/SourcesWPE.txt 2019-02-14 11:27:30 UTC (rev 241528)
@@ -179,6 +179,7 @@
UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp
+UIProcess/glib/WebProcessPoolGLib.cpp
UIProcess/glib/WebProcessProxyGLib.cpp
UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
@@ -208,7 +209,6 @@
UIProcess/wpe/WebPageProxyWPE.cpp
UIProcess/wpe/WebPasteboardProxyWPE.cpp
UIProcess/wpe/WebPreferencesWPE.cpp
-UIProcess/wpe/WebProcessPoolWPE.cpp
WebProcess/InjectedBundle/API/glib/DOM/DOMObjectCache.cpp @no-unify
WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMDocument.cpp @no-unify
Copied: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp (from rev 241527, releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp) (0 => 241528)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp (rev 0)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2019-02-14 11:27:30 UTC (rev 241528)
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
+ * Copyright (C) 2012 Samsung Electronics Ltd. 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 "WebProcessPool.h"
+
+#include "WebMemoryPressureHandler.h"
+#include "WebProcessCreationParameters.h"
+#include <_javascript_Core/RemoteInspectorServer.h>
+#include <WebCore/GStreamerCommon.h>
+#include <wtf/glib/GUniquePtr.h>
+
+namespace WebKit {
+
+#if ENABLE(REMOTE_INSPECTOR)
+static void initializeRemoteInspectorServer(const char* address)
+{
+ if (Inspector::RemoteInspectorServer::singleton().isRunning())
+ return;
+
+ if (!address[0])
+ return;
+
+ GUniquePtr<char> inspectorAddress(g_strdup(address));
+ char* portPtr = g_strrstr(inspectorAddress.get(), ":");
+ if (!portPtr)
+ return;
+
+ *portPtr = '\0';
+ portPtr++;
+ guint64 port = g_ascii_strtoull(portPtr, nullptr, 10);
+ if (!port)
+ return;
+
+ Inspector::RemoteInspectorServer::singleton().start(inspectorAddress.get(), port);
+}
+#endif
+
+static bool memoryPressureMonitorDisabled()
+{
+ static const char* disableMemoryPressureMonitor = getenv("WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR");
+ return disableMemoryPressureMonitor && !strcmp(disableMemoryPressureMonitor, "1");
+}
+
+void WebProcessPool::platformInitialize()
+{
+#if ENABLE(REMOTE_INSPECTOR)
+ if (const char* address = g_getenv("WEBKIT_INSPECTOR_SERVER"))
+ initializeRemoteInspectorServer(address);
+#endif
+
+#if PLATFORM(GTK)
+ // To enable this for WPE, we need WebMemoryPressureHandler to lose the
+ // hard dependency on ViewSnapshotStore.
+ if (!memoryPressureMonitorDisabled())
+ installMemoryPressureHandler();
+#endif
+}
+
+void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
+{
+ parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModel::DocumentViewer;
+ parameters.proxySettings = m_networkProxySettings;
+
+#if PLATFORM(GTK)
+ // This is misnamed. It can only be used to disable complex text.
+ parameters.shouldAlwaysUseComplexTextCodePath = true;
+ const char* forceComplexText = getenv("WEBKIT_FORCE_COMPLEX_TEXT");
+ if (forceComplexText && !strcmp(forceComplexText, "0"))
+ parameters.shouldAlwaysUseComplexTextCodePath = m_alwaysUsesComplexTextCodePath;
+#endif
+
+ if (memoryPressureMonitorDisabled())
+ parameters.shouldSuppressMemoryPressureHandler = true;
+
+#if USE(GSTREAMER)
+ parameters.gstreamerOptions = WebCore::extractGStreamerOptionsFromCommandLine();
+#endif
+}
+
+void WebProcessPool::platformInvalidateContext()
+{
+}
+
+void WebProcessPool::platformResolvePathsForSandboxExtensions()
+{
+}
+
+} // namespace WebKit
Deleted: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp (241527 => 241528)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp 2019-02-14 11:27:24 UTC (rev 241527)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp 2019-02-14 11:27:30 UTC (rev 241528)
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
- * Copyright (C) 2012 Samsung Electronics Ltd. 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 "WebProcessPool.h"
-
-#include "APIProcessPoolConfiguration.h"
-#include "Logging.h"
-#include "WebCookieManagerProxy.h"
-#include "WebMemoryPressureHandler.h"
-#include "WebProcessCreationParameters.h"
-#include "WebProcessMessages.h"
-#include <_javascript_Core/RemoteInspectorServer.h>
-#include <WebCore/GStreamerCommon.h>
-#include <WebCore/NotImplemented.h>
-#include <WebCore/SchemeRegistry.h>
-#include <wtf/FileSystem.h>
-#include <wtf/glib/GUniquePtr.h>
-#include <wtf/text/CString.h>
-
-namespace WebKit {
-
-#if ENABLE(REMOTE_INSPECTOR)
-static void initializeRemoteInspectorServer(const char* address)
-{
- if (Inspector::RemoteInspectorServer::singleton().isRunning())
- return;
-
- if (!address[0])
- return;
-
- GUniquePtr<char> inspectorAddress(g_strdup(address));
- char* portPtr = g_strrstr(inspectorAddress.get(), ":");
- if (!portPtr)
- return;
-
- *portPtr = '\0';
- portPtr++;
- guint64 port = g_ascii_strtoull(portPtr, nullptr, 10);
- if (!port)
- return;
-
- Inspector::RemoteInspectorServer::singleton().start(inspectorAddress.get(), port);
-}
-#endif
-
-static bool memoryPressureMonitorDisabled()
-{
- static const char* disableMemoryPressureMonitor = getenv("WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR");
- return disableMemoryPressureMonitor && !strcmp(disableMemoryPressureMonitor, "1");
-}
-
-void WebProcessPool::platformInitialize()
-{
-#if ENABLE(REMOTE_INSPECTOR)
- if (const char* address = g_getenv("WEBKIT_INSPECTOR_SERVER"))
- initializeRemoteInspectorServer(address);
-#endif
-
- if (!memoryPressureMonitorDisabled())
- installMemoryPressureHandler();
-}
-
-void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
-{
- parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModel::DocumentViewer;
- parameters.proxySettings = m_networkProxySettings;
-
- parameters.shouldAlwaysUseComplexTextCodePath = true;
- const char* forceComplexText = getenv("WEBKIT_FORCE_COMPLEX_TEXT");
- if (forceComplexText && !strcmp(forceComplexText, "0"))
- parameters.shouldAlwaysUseComplexTextCodePath = m_alwaysUsesComplexTextCodePath;
-
- if (memoryPressureMonitorDisabled())
- parameters.shouldSuppressMemoryPressureHandler = true;
-
-#if USE(GSTREAMER)
- parameters.gstreamerOptions = WebCore::extractGStreamerOptionsFromCommandLine();
-#endif
-}
-
-void WebProcessPool::platformInvalidateContext()
-{
-}
-
-void WebProcessPool::platformResolvePathsForSandboxExtensions()
-{
-}
-
-} // namespace WebKit
Deleted: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/wpe/WebProcessPoolWPE.cpp (241527 => 241528)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/wpe/WebProcessPoolWPE.cpp 2019-02-14 11:27:24 UTC (rev 241527)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/wpe/WebProcessPoolWPE.cpp 2019-02-14 11:27:30 UTC (rev 241528)
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
- * Copyright (C) 2012 Samsung Electronics Ltd. 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 "WebProcessPool.h"
-
-#include "APIProcessPoolConfiguration.h"
-#include "Logging.h"
-#include "NetworkProcessMessages.h"
-#include "WebCookieManagerProxy.h"
-#include "WebProcessCreationParameters.h"
-#include "WebProcessMessages.h"
-#include <WebCore/NotImplemented.h>
-#include <WebCore/SchemeRegistry.h>
-#include <cstdlib>
-#include <wtf/FileSystem.h>
-
-#if ENABLE(REMOTE_INSPECTOR)
-#include <_javascript_Core/RemoteInspectorServer.h>
-#include <wtf/glib/GUniquePtr.h>
-#endif
-
-#if USE(GSTREAMER)
-#include <WebCore/GStreamerCommon.h>
-#endif
-
-namespace WebKit {
-
-#if ENABLE(REMOTE_INSPECTOR)
-static void initializeRemoteInspectorServer(const char* address)
-{
- if (Inspector::RemoteInspectorServer::singleton().isRunning())
- return;
-
- if (!address[0])
- return;
-
- GUniquePtr<char> inspectorAddress(g_strdup(address));
- char* portPtr = g_strrstr(inspectorAddress.get(), ":");
- if (!portPtr)
- return;
-
- *portPtr = '\0';
- portPtr++;
- guint64 port = g_ascii_strtoull(portPtr, nullptr, 10);
- if (!port)
- return;
-
- Inspector::RemoteInspectorServer::singleton().start(inspectorAddress.get(), port);
-}
-#endif
-
-void WebProcessPool::platformInitialize()
-{
-#if ENABLE(REMOTE_INSPECTOR)
- if (const char* address = g_getenv("WEBKIT_INSPECTOR_SERVER"))
- initializeRemoteInspectorServer(address);
-#endif
-}
-
-void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
-{
- parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModel::DocumentViewer;
-
- const char* disableMemoryPressureMonitor = getenv("WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR");
- if (disableMemoryPressureMonitor && !strcmp(disableMemoryPressureMonitor, "1"))
- parameters.shouldSuppressMemoryPressureHandler = true;
-
-#if USE(GSTREAMER)
- parameters.gstreamerOptions = WebCore::extractGStreamerOptionsFromCommandLine();
-#endif
-}
-
-void WebProcessPool::platformInvalidateContext()
-{
- notImplemented();
-}
-
-void WebProcessPool::platformResolvePathsForSandboxExtensions()
-{
-}
-
-} // namespace WebKit
