Diff
Modified: trunk/Source/WebCore/ChangeLog (287105 => 287106)
--- trunk/Source/WebCore/ChangeLog 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/ChangeLog 2021-12-15 21:34:14 UTC (rev 287106)
@@ -1,3 +1,25 @@
+2021-12-15 Alex Christensen <achristen...@webkit.org>
+
+ Remove ProxyServer
+ https://bugs.webkit.org/show_bug.cgi?id=234362
+
+ Reviewed by Geoffrey Garen.
+
+ It was only used for NPAPI.
+
+ * PlatformAppleWin.cmake:
+ * PlatformMac.cmake:
+ * Sources.txt:
+ * SourcesCocoa.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/Curl.cmake:
+ * platform/SourcesSoup.txt:
+ * platform/network/ProxyServer.cpp: Removed.
+ * platform/network/ProxyServer.h: Removed.
+ * platform/network/cf/ProxyServerCFNet.cpp: Removed.
+ * platform/network/curl/ProxyServerCurl.cpp: Removed.
+ * platform/network/soup/ProxyServerSoup.cpp: Removed.
+
2021-12-15 Tyler Wilcock <tyle...@apple.com>
AX: Move comment about accessibilityShouldUseUniqueId in WebAccessibilityObjectWrapperMac.mm to the right place
Modified: trunk/Source/WebCore/PlatformAppleWin.cmake (287105 => 287106)
--- trunk/Source/WebCore/PlatformAppleWin.cmake 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/PlatformAppleWin.cmake 2021-12-15 21:34:14 UTC (rev 287106)
@@ -43,7 +43,6 @@
platform/network/cf/NetworkStorageSessionCFNet.cpp
platform/network/cf/NetworkStorageSessionCFNetWin.cpp
platform/network/cf/ProtectionSpaceCFNet.cpp
- platform/network/cf/ProxyServerCFNet.cpp
platform/network/cf/ResourceErrorCF.cpp
platform/network/cf/ResourceHandleCFNet.cpp
platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
Modified: trunk/Source/WebCore/PlatformMac.cmake (287105 => 287106)
--- trunk/Source/WebCore/PlatformMac.cmake 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/PlatformMac.cmake 2021-12-15 21:34:14 UTC (rev 287106)
@@ -402,7 +402,6 @@
platform/network/cf/DNSResolveQueueCFNet.cpp
platform/network/cf/FormDataStreamCFNet.cpp
platform/network/cf/NetworkStorageSessionCFNet.cpp
- platform/network/cf/ProxyServerCFNet.cpp
platform/network/cf/ResourceRequestCFNet.cpp
platform/network/cf/SocketStreamHandleImplCFNet.cpp
Modified: trunk/Source/WebCore/Sources.txt (287105 => 287106)
--- trunk/Source/WebCore/Sources.txt 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/Sources.txt 2021-12-15 21:34:14 UTC (rev 287106)
@@ -2227,7 +2227,6 @@
platform/network/ParsedContentType.cpp
platform/network/ParsedRequestRange.cpp
platform/network/ProtectionSpaceBase.cpp
-platform/network/ProxyServer.cpp
platform/network/ResourceErrorBase.cpp
platform/network/ResourceHandle.cpp
platform/network/ResourceHandleClient.cpp
Modified: trunk/Source/WebCore/SourcesCocoa.txt (287105 => 287106)
--- trunk/Source/WebCore/SourcesCocoa.txt 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2021-12-15 21:34:14 UTC (rev 287106)
@@ -565,7 +565,6 @@
platform/network/cf/DNSResolveQueueCFNet.cpp
platform/network/cf/FormDataStreamCFNet.cpp
platform/network/cf/NetworkStorageSessionCFNet.cpp
-platform/network/cf/ProxyServerCFNet.cpp
platform/network/cf/ResourceRequestCFNet.cpp
platform/network/cf/SocketStreamHandleImplCFNet.cpp
platform/network/cocoa/CertificateInfoCocoa.mm
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (287105 => 287106)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-12-15 21:34:14 UTC (rev 287106)
@@ -610,7 +610,6 @@
1AF62F2614DAFEA10041556C /* ScrollingThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF62F2114DAFE790041556C /* ScrollingThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AF7AFC81A48A8BC00C8E4E7 /* SecurityOriginPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF7AFC61A48A8BC00C8E4E7 /* SecurityOriginPolicy.h */; };
1AF89A421518FDEA00E547B5 /* TiledBacking.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF89A411518FDEA00E547B5 /* TiledBacking.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 1AF8E11A1256592600230FF7 /* ProxyServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF8E1191256592600230FF7 /* ProxyServer.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AFE119A0CBFFCC4003017FA /* JSSQLResultSetRowList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFE11980CBFFCC4003017FA /* JSSQLResultSetRowList.h */; };
1AFFC4581D5E865500267A66 /* WebGLBlocklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFFC4511D5E7EC700267A66 /* WebGLBlocklist.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AFFC4591D5E866100267A66 /* PluginBlocklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFFC44F1D5E7EC700267A66 /* PluginBlocklist.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7045,10 +7044,7 @@
1AF7AFC51A48A8BC00C8E4E7 /* SecurityOriginPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecurityOriginPolicy.cpp; sourceTree = "<group>"; };
1AF7AFC61A48A8BC00C8E4E7 /* SecurityOriginPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityOriginPolicy.h; sourceTree = "<group>"; };
1AF89A411518FDEA00E547B5 /* TiledBacking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TiledBacking.h; sourceTree = "<group>"; };
- 1AF8E1191256592600230FF7 /* ProxyServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyServer.h; sourceTree = "<group>"; };
- 1AF8E13212565A4400230FF7 /* ProxyServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProxyServer.cpp; sourceTree = "<group>"; };
1AF8E13212565A4445230FF7 /* DNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DNS.cpp; sourceTree = "<group>"; };
- 1AF8E1C1125673E000230FF7 /* ProxyServerCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProxyServerCFNet.cpp; sourceTree = "<group>"; };
1AFE11970CBFFCC4003017FA /* JSSQLResultSetRowList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLResultSetRowList.cpp; sourceTree = "<group>"; };
1AFE11980CBFFCC4003017FA /* JSSQLResultSetRowList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLResultSetRowList.h; sourceTree = "<group>"; };
1AFFC44D1D5E7EC700267A66 /* BlocklistUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlocklistUpdater.h; sourceTree = "<group>"; };
@@ -23645,8 +23641,6 @@
514C765F0CE923A1007EF3CD /* ProtectionSpaceBase.cpp */,
514C76600CE923A1007EF3CD /* ProtectionSpaceBase.h */,
51A052551058874000CC9E95 /* ProtectionSpaceHash.h */,
- 1AF8E13212565A4400230FF7 /* ProxyServer.cpp */,
- 1AF8E1191256592600230FF7 /* ProxyServer.h */,
934F713D0D5A6F2800018D69 /* ResourceErrorBase.cpp */,
934F713B0D5A6F1900018D69 /* ResourceErrorBase.h */,
514C76630CE923A1007EF3CD /* ResourceHandle.cpp */,
@@ -28967,7 +28961,6 @@
7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */,
7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */,
E13EF34716850C470034C83F /* NetworkStorageSessionCFNet.cpp */,
- 1AF8E1C1125673E000230FF7 /* ProxyServerCFNet.cpp */,
7EE6845712D26E3800E79415 /* ResourceError.h */,
7EE6845A12D26E3800E79415 /* ResourceRequest.h */,
7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */,
@@ -36443,7 +36436,6 @@
514C76750CE923A1007EF3CD /* ProtectionSpaceBase.h in Headers */,
372ADA38197F47B900FC501E /* ProtectionSpaceCocoa.h in Headers */,
51A052561058874000CC9E95 /* ProtectionSpaceHash.h in Headers */,
- 1AF8E11A1256592600230FF7 /* ProxyServer.h in Headers */,
E45A6C772417BA59006E4CD5 /* PseudoClassChangeInvalidation.h in Headers */,
FF945ECC161F7F3600971BC8 /* PseudoElement.h in Headers */,
57D8462E1FEAF69900CA3682 /* PublicKeyCredential.h in Headers */,
Modified: trunk/Source/WebCore/platform/Curl.cmake (287105 => 287106)
--- trunk/Source/WebCore/platform/Curl.cmake 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/platform/Curl.cmake 2021-12-15 21:34:14 UTC (rev 287106)
@@ -27,7 +27,6 @@
platform/network/curl/NetworkStorageSessionCurl.cpp
platform/network/curl/OpenSSLHelper.cpp
platform/network/curl/ProtectionSpaceCurl.cpp
- platform/network/curl/ProxyServerCurl.cpp
platform/network/curl/PublicSuffixCurl.cpp
platform/network/curl/ResourceErrorCurl.cpp
platform/network/curl/ResourceHandleCurl.cpp
Modified: trunk/Source/WebCore/platform/SourcesSoup.txt (287105 => 287106)
--- trunk/Source/WebCore/platform/SourcesSoup.txt 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/platform/SourcesSoup.txt 2021-12-15 21:34:14 UTC (rev 287106)
@@ -28,7 +28,6 @@
platform/network/soup/CredentialSoup.cpp
platform/network/soup/CredentialStorageSoup.cpp
platform/network/soup/NetworkStorageSessionSoup.cpp
-platform/network/soup/ProxyServerSoup.cpp
platform/network/soup/ResourceErrorSoup.cpp
platform/network/soup/ResourceHandleSoup.cpp
platform/network/soup/ResourceRequestSoup.cpp
Deleted: trunk/Source/WebCore/platform/network/ProxyServer.cpp (287105 => 287106)
--- trunk/Source/WebCore/platform/network/ProxyServer.cpp 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/platform/network/ProxyServer.cpp 2021-12-15 21:34:14 UTC (rev 287106)
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2010 Apple 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 "ProxyServer.h"
-
-#include <wtf/text/StringBuilder.h>
-
-namespace WebCore {
-
-static void appendProxyServerString(StringBuilder& builder, const ProxyServer& proxyServer)
-{
- ASSERT(!proxyServer.hostName().isNull());
- ASSERT(proxyServer.port() != -1);
-
- switch (proxyServer.type()) {
- case ProxyServer::Direct:
- builder.append("DIRECT");
- break;
- case ProxyServer::HTTP:
- case ProxyServer::HTTPS:
- builder.append("PROXY ", proxyServer.hostName(), ':', proxyServer.port());
- break;
- case ProxyServer::SOCKS:
- builder.append("SOCKS ", proxyServer.hostName(), ':', proxyServer.port());
- break;
- }
-}
-
-String toString(const Vector<ProxyServer>& proxyServers)
-{
- if (proxyServers.isEmpty())
- return "DIRECT";
-
- StringBuilder stringBuilder;
- for (size_t i = 0; i < proxyServers.size(); ++i) {
- if (i)
- stringBuilder.append("; ");
- appendProxyServerString(stringBuilder, proxyServers[i]);
- }
- return stringBuilder.toString();
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/network/ProxyServer.h (287105 => 287106)
--- trunk/Source/WebCore/platform/network/ProxyServer.h 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/platform/network/ProxyServer.h 2021-12-15 21:34:14 UTC (rev 287106)
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2010 Apple 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.
- */
-
-#pragma once
-
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class NetworkingContext;
-
-// Represents a single proxy server.
-class ProxyServer {
-public:
- enum Type {
- Direct,
- HTTP,
- HTTPS,
- SOCKS,
- };
-
- ProxyServer()
- : m_type(Direct)
- , m_port(-1)
- {
- }
-
- ProxyServer(Type type, const String& hostName, int port)
- : m_type(type)
- , m_hostName(hostName)
- , m_port(port)
- {
- }
-
- Type type() const { return m_type; }
- const String& hostName() const { return m_hostName; }
- int port() const { return m_port; }
-
-private:
- Type m_type;
- String m_hostName;
- int m_port;
-};
-
-// Return a vector of proxy servers for the given URL.
-// FIXME: This is dead code. Remove it.
-WEBCORE_EXPORT Vector<ProxyServer> proxyServersForURL(const URL&);
-
-// Converts the given vector of proxy servers to a PAC string, as described in
-// http://web.archive.org/web/20060424005037/wp.netscape.com/eng/mozilla/2.0/relnotes/demo/proxy-live.html
-WEBCORE_EXPORT String toString(const Vector<ProxyServer>&);
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/network/cf/ProxyServerCFNet.cpp (287105 => 287106)
--- trunk/Source/WebCore/platform/network/cf/ProxyServerCFNet.cpp 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/platform/network/cf/ProxyServerCFNet.cpp 2021-12-15 21:34:14 UTC (rev 287106)
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2010 Apple 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 "ProxyServer.h"
-
-#include <wtf/URL.h>
-#include "Logging.h"
-#include <wtf/RetainPtr.h>
-#include <wtf/cf/TypeCastsCF.h>
-#include <wtf/text/CString.h>
-
-#if PLATFORM(IOS_FAMILY) || PLATFORM(WIN)
-#include <CFNetwork/CFNetwork.h>
-#endif
-
-namespace WebCore {
-
-static void processProxyServers(Vector<ProxyServer>& proxyServers, CFArrayRef proxies, CFURLRef url);
-
-static void proxyAutoConfigurationResultCallback(void *context, CFArrayRef proxies, CFErrorRef error)
-{
- // We only expect a single result callback per invocation. Stop our runloop to unblock our caller.
- CFRunLoopStop(CFRunLoopGetCurrent());
-
- Vector<ProxyServer>* proxyServers = (Vector<ProxyServer>*)context;
- if (!proxies) {
- ASSERT(error);
- RetainPtr<CFStringRef> errorDescriptionCF = adoptCF(CFErrorCopyDescription(error));
- String errorDescription(errorDescriptionCF.get());
- LOG(Network, "Failed to process proxy auto-configuration file with error: %s", errorDescription.utf8().data());
- return;
- }
-
- processProxyServers(*proxyServers, proxies, 0);
-}
-
-static void processProxyServers(Vector<ProxyServer>& proxyServers, CFArrayRef proxies, CFURLRef url)
-{
- CFIndex numProxies = CFArrayGetCount(proxies);
- for (CFIndex i = 0; i < numProxies; ++i) {
- CFDictionaryRef proxyDictionary = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(proxies, i));
-
- ProxyServer::Type type = ProxyServer::Direct;
- CFStringRef typeString = static_cast<CFStringRef>(CFDictionaryGetValue(proxyDictionary, kCFProxyTypeKey));
-
- if (!url) {
- // If we have no URL then we're processing an auto-configuration response.
- // It isn't sensible to receive another auto-configured proxy in such a response.
- ASSERT(!CFEqual(typeString, kCFProxyTypeAutoConfigurationURL));
- }
-
- if (CFEqual(typeString, kCFProxyTypeAutoConfigurationURL)) {
- if (!url)
- continue;
-
- // FIXME: We should restructure to allow this to happen asynchronously.
- auto scriptURL = dynamic_cf_cast<CFURLRef>(CFDictionaryGetValue(proxyDictionary, kCFProxyAutoConfigurationURLKey));
- if (!scriptURL)
- continue;
-
- CFStreamClientContext context = { 0, (void*)&proxyServers, 0, 0, 0 };
- RetainPtr<CFRunLoopSourceRef> runLoopSource = adoptCF(CFNetworkExecuteProxyAutoConfigurationURL(scriptURL, url, proxyAutoConfigurationResultCallback, &context));
-
- CFStringRef privateRunLoopMode = CFSTR("com.apple.WebKit.ProxyAutoConfiguration");
- CFTimeInterval timeout = 5;
- CFRunLoopAddSource(CFRunLoopGetCurrent(), runLoopSource.get(), privateRunLoopMode);
- CFRunLoopRunInMode(privateRunLoopMode, timeout, 0);
- CFRunLoopRemoveSource(CFRunLoopGetCurrent(), runLoopSource.get(), privateRunLoopMode);
- CFRunLoopSourceInvalidate(runLoopSource.get());
-
- // The proxyAutoConfigurationResultCallback has added any relevant ProxyServers to proxyServers.
- continue;
- }
-
- if (CFEqual(typeString, kCFProxyTypeNone)) {
- proxyServers.append(ProxyServer(ProxyServer::Direct, String(), -1));
- continue;
- }
-
- if (CFEqual(typeString, kCFProxyTypeHTTP))
- type = ProxyServer::HTTP;
- else if (CFEqual(typeString, kCFProxyTypeHTTPS))
- type = ProxyServer::HTTPS;
- else if (CFEqual(typeString, kCFProxyTypeSOCKS))
- type = ProxyServer::SOCKS;
- else {
- // We don't know how to handle this type.
- continue;
- }
-
- CFStringRef host = static_cast<CFStringRef>(CFDictionaryGetValue(proxyDictionary, kCFProxyHostNameKey));
- CFNumberRef port = static_cast<CFNumberRef>(CFDictionaryGetValue(proxyDictionary, kCFProxyPortNumberKey));
- SInt32 portValue;
- CFNumberGetValue(port, kCFNumberSInt32Type, &portValue);
-
- proxyServers.append(ProxyServer(type, host, portValue));
- }
-}
-
-static void addProxyServersForURL(Vector<ProxyServer>& proxyServers, const URL& url)
-{
- RetainPtr<CFDictionaryRef> proxySettings = adoptCF(CFNetworkCopySystemProxySettings());
- if (!proxySettings)
- return;
-
- RetainPtr<CFURLRef> cfURL = url.createCFURL();
- RetainPtr<CFArrayRef> proxiesForURL = adoptCF(CFNetworkCopyProxiesForURL(cfURL.get(), proxySettings.get()));
- if (!proxiesForURL)
- return;
-
- processProxyServers(proxyServers, proxiesForURL.get(), cfURL.get());
-}
-
-Vector<ProxyServer> proxyServersForURL(const URL& url)
-{
- Vector<ProxyServer> proxyServers;
-
- addProxyServersForURL(proxyServers, url);
- return proxyServers;
-
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/network/curl/ProxyServerCurl.cpp (287105 => 287106)
--- trunk/Source/WebCore/platform/network/curl/ProxyServerCurl.cpp 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/platform/network/curl/ProxyServerCurl.cpp 2021-12-15 21:34:14 UTC (rev 287106)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2010 Brent Fulgham <bfulg...@webkit.org>. 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 "ProxyServer.h"
-
-#if USE(CURL)
-
-#include <wtf/URL.h>
-
-namespace WebCore {
-
-Vector<ProxyServer> proxyServersForURL(const URL&)
-{
- // FIXME: Implement.
- return Vector<ProxyServer>();
-}
-
-} // namespace WebCore
-
-#endif
Deleted: trunk/Source/WebCore/platform/network/soup/ProxyServerSoup.cpp (287105 => 287106)
--- trunk/Source/WebCore/platform/network/soup/ProxyServerSoup.cpp 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebCore/platform/network/soup/ProxyServerSoup.cpp 2021-12-15 21:34:14 UTC (rev 287106)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2010 Brent Fulgham <bfulg...@webkit.org>. 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 "ProxyServer.h"
-
-#if USE(SOUP)
-
-#include <wtf/URL.h>
-
-namespace WebCore {
-
-Vector<ProxyServer> proxyServersForURL(const URL&)
-{
- // FIXME: Implement.
- return Vector<ProxyServer>();
-}
-
-} // namespace WebCore
-
-#endif
Modified: trunk/Source/WebKit/ChangeLog (287105 => 287106)
--- trunk/Source/WebKit/ChangeLog 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebKit/ChangeLog 2021-12-15 21:34:14 UTC (rev 287106)
@@ -1,3 +1,12 @@
+2021-12-15 Alex Christensen <achristen...@webkit.org>
+
+ Remove ProxyServer
+ https://bugs.webkit.org/show_bug.cgi?id=234362
+
+ Reviewed by Geoffrey Garen.
+
+ * WebProcess/Plugins/PluginView.cpp:
+
2021-12-15 Chris Dumez <cdu...@apple.com>
RELEASE_ASSERT in WTF::Deque<WebKit::NativeWebKeyboardEvent, 0ul>::first()
Modified: trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp (287105 => 287106)
--- trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp 2021-12-15 21:32:07 UTC (rev 287105)
+++ trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp 2021-12-15 21:34:14 UTC (rev 287106)
@@ -61,7 +61,6 @@
#include <WebCore/PageInlines.h>
#include <WebCore/PlatformMouseEvent.h>
#include <WebCore/ProtectionSpace.h>
-#include <WebCore/ProxyServer.h>
#include <WebCore/RenderEmbeddedObject.h>
#include <WebCore/ScriptController.h>
#include <WebCore/ScrollView.h>
