<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[287106] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/287106">287106</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-12-15 13:34:14 -0800 (Wed, 15 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove ProxyServer
https://bugs.webkit.org/show_bug.cgi?id=234362

Patch by Alex Christensen <achristensen@webkit.org> on 2021-12-15
Reviewed by Geoffrey Garen.

Source/WebCore:

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.

Source/WebKit:

* WebProcess/Plugins/PluginView.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformAppleWincmake">trunk/Source/WebCore/PlatformAppleWin.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreSourcestxt">trunk/Source/WebCore/Sources.txt</a></li>
<li><a href="#trunkSourceWebCoreSourcesCocoatxt">trunk/Source/WebCore/SourcesCocoa.txt</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformCurlcmake">trunk/Source/WebCore/platform/Curl.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformSourcesSouptxt">trunk/Source/WebCore/platform/SourcesSoup.txt</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessPluginsPluginViewcpp">trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkProxyServercpp">trunk/Source/WebCore/platform/network/ProxyServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkProxyServerh">trunk/Source/WebCore/platform/network/ProxyServer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfProxyServerCFNetcpp">trunk/Source/WebCore/platform/network/cf/ProxyServerCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlProxyServerCurlcpp">trunk/Source/WebCore/platform/network/curl/ProxyServerCurl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupProxyServerSoupcpp">trunk/Source/WebCore/platform/network/soup/ProxyServerSoup.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2021-12-15  Alex Christensen  <achristensen@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.
+
</ins><span class="cx"> 2021-12-15  Tyler Wilcock  <tyler_w@apple.com>
</span><span class="cx"> 
</span><span class="cx">         AX: Move comment about accessibilityShouldUseUniqueId in WebAccessibilityObjectWrapperMac.mm to the right place
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformAppleWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformAppleWin.cmake (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx">     platform/network/cf/NetworkStorageSessionCFNet.cpp
</span><span class="cx">     platform/network/cf/NetworkStorageSessionCFNetWin.cpp
</span><span class="cx">     platform/network/cf/ProtectionSpaceCFNet.cpp
</span><del>-    platform/network/cf/ProxyServerCFNet.cpp
</del><span class="cx">     platform/network/cf/ResourceErrorCF.cpp
</span><span class="cx">     platform/network/cf/ResourceHandleCFNet.cpp
</span><span class="cx">     platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -402,7 +402,6 @@
</span><span class="cx">     platform/network/cf/DNSResolveQueueCFNet.cpp
</span><span class="cx">     platform/network/cf/FormDataStreamCFNet.cpp
</span><span class="cx">     platform/network/cf/NetworkStorageSessionCFNet.cpp
</span><del>-    platform/network/cf/ProxyServerCFNet.cpp
</del><span class="cx">     platform/network/cf/ResourceRequestCFNet.cpp
</span><span class="cx">     platform/network/cf/SocketStreamHandleImplCFNet.cpp
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreSourcestxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Sources.txt (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2227,7 +2227,6 @@
</span><span class="cx"> platform/network/ParsedContentType.cpp
</span><span class="cx"> platform/network/ParsedRequestRange.cpp
</span><span class="cx"> platform/network/ProtectionSpaceBase.cpp
</span><del>-platform/network/ProxyServer.cpp
</del><span class="cx"> platform/network/ResourceErrorBase.cpp
</span><span class="cx"> platform/network/ResourceHandle.cpp
</span><span class="cx"> platform/network/ResourceHandleClient.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreSourcesCocoatxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/SourcesCocoa.txt (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -565,7 +565,6 @@
</span><span class="cx"> platform/network/cf/DNSResolveQueueCFNet.cpp
</span><span class="cx"> platform/network/cf/FormDataStreamCFNet.cpp
</span><span class="cx"> platform/network/cf/NetworkStorageSessionCFNet.cpp
</span><del>-platform/network/cf/ProxyServerCFNet.cpp
</del><span class="cx"> platform/network/cf/ResourceRequestCFNet.cpp
</span><span class="cx"> platform/network/cf/SocketStreamHandleImplCFNet.cpp
</span><span class="cx"> platform/network/cocoa/CertificateInfoCocoa.mm
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -610,7 +610,6 @@
</span><span class="cx">          1AF62F2614DAFEA10041556C /* ScrollingThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF62F2114DAFE790041556C /* ScrollingThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          1AF7AFC81A48A8BC00C8E4E7 /* SecurityOriginPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF7AFC61A48A8BC00C8E4E7 /* SecurityOriginPolicy.h */; };
</span><span class="cx">          1AF89A421518FDEA00E547B5 /* TiledBacking.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF89A411518FDEA00E547B5 /* TiledBacking.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>-               1AF8E11A1256592600230FF7 /* ProxyServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF8E1191256592600230FF7 /* ProxyServer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx">           1AFE119A0CBFFCC4003017FA /* JSSQLResultSetRowList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFE11980CBFFCC4003017FA /* JSSQLResultSetRowList.h */; };
</span><span class="cx">          1AFFC4581D5E865500267A66 /* WebGLBlocklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFFC4511D5E7EC700267A66 /* WebGLBlocklist.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          1AFFC4591D5E866100267A66 /* PluginBlocklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFFC44F1D5E7EC700267A66 /* PluginBlocklist.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -7045,10 +7044,7 @@
</span><span class="cx">          1AF7AFC51A48A8BC00C8E4E7 /* SecurityOriginPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecurityOriginPolicy.cpp; sourceTree = "<group>"; };
</span><span class="cx">          1AF7AFC61A48A8BC00C8E4E7 /* SecurityOriginPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityOriginPolicy.h; sourceTree = "<group>"; };
</span><span class="cx">          1AF89A411518FDEA00E547B5 /* TiledBacking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TiledBacking.h; sourceTree = "<group>"; };
</span><del>-               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>"; };
</del><span class="cx">           1AF8E13212565A4445230FF7 /* DNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DNS.cpp; sourceTree = "<group>"; };
</span><del>-               1AF8E1C1125673E000230FF7 /* ProxyServerCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProxyServerCFNet.cpp; sourceTree = "<group>"; };
</del><span class="cx">           1AFE11970CBFFCC4003017FA /* JSSQLResultSetRowList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLResultSetRowList.cpp; sourceTree = "<group>"; };
</span><span class="cx">          1AFE11980CBFFCC4003017FA /* JSSQLResultSetRowList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLResultSetRowList.h; sourceTree = "<group>"; };
</span><span class="cx">          1AFFC44D1D5E7EC700267A66 /* BlocklistUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlocklistUpdater.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -23645,8 +23641,6 @@
</span><span class="cx">                          514C765F0CE923A1007EF3CD /* ProtectionSpaceBase.cpp */,
</span><span class="cx">                          514C76600CE923A1007EF3CD /* ProtectionSpaceBase.h */,
</span><span class="cx">                          51A052551058874000CC9E95 /* ProtectionSpaceHash.h */,
</span><del>-                               1AF8E13212565A4400230FF7 /* ProxyServer.cpp */,
-                               1AF8E1191256592600230FF7 /* ProxyServer.h */,
</del><span class="cx">                           934F713D0D5A6F2800018D69 /* ResourceErrorBase.cpp */,
</span><span class="cx">                          934F713B0D5A6F1900018D69 /* ResourceErrorBase.h */,
</span><span class="cx">                          514C76630CE923A1007EF3CD /* ResourceHandle.cpp */,
</span><span class="lines">@@ -28967,7 +28961,6 @@
</span><span class="cx">                          7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */,
</span><span class="cx">                          7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */,
</span><span class="cx">                          E13EF34716850C470034C83F /* NetworkStorageSessionCFNet.cpp */,
</span><del>-                               1AF8E1C1125673E000230FF7 /* ProxyServerCFNet.cpp */,
</del><span class="cx">                           7EE6845712D26E3800E79415 /* ResourceError.h */,
</span><span class="cx">                          7EE6845A12D26E3800E79415 /* ResourceRequest.h */,
</span><span class="cx">                          7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */,
</span><span class="lines">@@ -36443,7 +36436,6 @@
</span><span class="cx">                          514C76750CE923A1007EF3CD /* ProtectionSpaceBase.h in Headers */,
</span><span class="cx">                          372ADA38197F47B900FC501E /* ProtectionSpaceCocoa.h in Headers */,
</span><span class="cx">                          51A052561058874000CC9E95 /* ProtectionSpaceHash.h in Headers */,
</span><del>-                               1AF8E11A1256592600230FF7 /* ProxyServer.h in Headers */,
</del><span class="cx">                           E45A6C772417BA59006E4CD5 /* PseudoClassChangeInvalidation.h in Headers */,
</span><span class="cx">                          FF945ECC161F7F3600971BC8 /* PseudoElement.h in Headers */,
</span><span class="cx">                          57D8462E1FEAF69900CA3682 /* PublicKeyCredential.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCurlcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Curl.cmake (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx">     platform/network/curl/NetworkStorageSessionCurl.cpp
</span><span class="cx">     platform/network/curl/OpenSSLHelper.cpp
</span><span class="cx">     platform/network/curl/ProtectionSpaceCurl.cpp
</span><del>-    platform/network/curl/ProxyServerCurl.cpp
</del><span class="cx">     platform/network/curl/PublicSuffixCurl.cpp
</span><span class="cx">     platform/network/curl/ResourceErrorCurl.cpp
</span><span class="cx">     platform/network/curl/ResourceHandleCurl.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSourcesSouptxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SourcesSoup.txt (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> platform/network/soup/CredentialSoup.cpp
</span><span class="cx"> platform/network/soup/CredentialStorageSoup.cpp
</span><span class="cx"> platform/network/soup/NetworkStorageSessionSoup.cpp
</span><del>-platform/network/soup/ProxyServerSoup.cpp
</del><span class="cx"> platform/network/soup/ResourceErrorSoup.cpp
</span><span class="cx"> platform/network/soup/ResourceHandleSoup.cpp
</span><span class="cx"> platform/network/soup/ResourceRequestSoup.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkProxyServercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/ProxyServer.cpp (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkProxyServerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/ProxyServer.h (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfProxyServerCFNetcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/cf/ProxyServerCFNet.cpp (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,146 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlProxyServerCurlcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/curl/ProxyServerCurl.cpp (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Brent Fulgham <bfulgham@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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupProxyServerSoupcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/soup/ProxyServerSoup.cpp (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Brent Fulgham <bfulgham@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
</del></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2021-12-15  Alex Christensen  <achristensen@webkit.org>
+
+        Remove ProxyServer
+        https://bugs.webkit.org/show_bug.cgi?id=234362
+
+        Reviewed by Geoffrey Garen.
+
+        * WebProcess/Plugins/PluginView.cpp:
+
</ins><span class="cx"> 2021-12-15  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         RELEASE_ASSERT in WTF::Deque<WebKit::NativeWebKeyboardEvent, 0ul>::first()
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp (287105 => 287106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> #include <WebCore/PageInlines.h>
</span><span class="cx"> #include <WebCore/PlatformMouseEvent.h>
</span><span class="cx"> #include <WebCore/ProtectionSpace.h>
</span><del>-#include <WebCore/ProxyServer.h>
</del><span class="cx"> #include <WebCore/RenderEmbeddedObject.h>
</span><span class="cx"> #include <WebCore/ScriptController.h>
</span><span class="cx"> #include <WebCore/ScrollView.h>
</span></span></pre>
</div>
</div>

</body>
</html>