<!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>[243427] trunk</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/243427">243427</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2019-03-24 13:42:37 -0700 (Sun, 24 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[watchOS] Remove unused Proximity Networking code
https://bugs.webkit.org/show_bug.cgi?id=196188

Reviewed by Tim Horton.

Source/WebKit:

* Configurations/WebKit.xcconfig:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::NetworkProcess):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):
* NetworkProcess/NetworkProcessCreationParameters.h:
* NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformPrepareToSuspend):
(WebKit::NetworkProcess::platformProcessDidResume):
(WebKit::NetworkProcess::platformProcessDidTransitionToBackground):
(WebKit::NetworkProcess::platformProcessDidTransitionToForeground):
* NetworkProcess/watchos/NetworkProximityAssertion.h: Removed.
* NetworkProcess/watchos/NetworkProximityAssertion.mm: Removed.
* NetworkProcess/watchos/NetworkProximityManager.h: Removed.
* NetworkProcess/watchos/NetworkProximityManager.mm: Removed.
* SourcesCocoa.txt:
* UIProcess/API/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::copy):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
(-[_WKProcessPoolConfiguration wirelessContextIdentifier]):
(-[_WKProcessPoolConfiguration setWirelessContextIdentifier:]):
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
* WebKit.xcodeproj/project.pbxproj:

Source/WTF:

* wtf/FeatureDefines.h:

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm:
(TEST):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitConfigurationsWebKitxcconfig">trunk/Source/WebKit/Configurations/WebKit.xcconfig</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcesscpp">trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcessh">trunk/Source/WebKit/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcessCreationParameterscpp">trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcessCreationParametersh">trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesscocoaNetworkDataTaskCocoah">trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesscocoaNetworkDataTaskCocoamm">trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitSourcesCocoatxt">trunk/Source/WebKit/SourcesCocoa.txt</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIAPIProcessPoolConfigurationcpp">trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIAPIProcessPoolConfigurationh">trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKProcessPoolConfigurationh">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKProcessPoolConfigurationmm">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaWKProcessPoolConfigurationmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WebKit/NetworkProcess/watchos/</li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WTF/ChangeLog  2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2019-03-24  Andy Estes  <aestes@apple.com>
+
+        [watchOS] Remove unused Proximity Networking code
+        https://bugs.webkit.org/show_bug.cgi?id=196188
+
+        Reviewed by Tim Horton.
+
+        * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2019-03-23  Keith Miller  <keith_miller@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Refactor clz/ctz and fix getLSBSet.
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h    2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WTF/wtf/FeatureDefines.h       2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -198,12 +198,6 @@
</span><span class="cx"> /* --------- Apple WATCHOS port --------- */
</span><span class="cx"> #if PLATFORM(WATCHOS)
</span><span class="cx"> 
</span><del>-#if !defined(ENABLE_PROXIMITY_NETWORKING)
-#if !TARGET_OS_SIMULATOR && __WATCH_OS_VERSION_MIN_REQUIRED < 60000
-#define ENABLE_PROXIMITY_NETWORKING 1
-#endif
-#endif
-
</del><span class="cx"> #endif /* PLATFORM(WATCHOS) */
</span><span class="cx"> 
</span><span class="cx"> /* --------- Apple MAC port (not IOS) --------- */
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/ChangeLog       2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2019-03-24  Andy Estes  <aestes@apple.com>
+
+        [watchOS] Remove unused Proximity Networking code
+        https://bugs.webkit.org/show_bug.cgi?id=196188
+
+        Reviewed by Tim Horton.
+
+        * Configurations/WebKit.xcconfig:
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::NetworkProcess):
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode const):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * NetworkProcess/NetworkProcessCreationParameters.h:
+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+        (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::platformPrepareToSuspend):
+        (WebKit::NetworkProcess::platformProcessDidResume):
+        (WebKit::NetworkProcess::platformProcessDidTransitionToBackground):
+        (WebKit::NetworkProcess::platformProcessDidTransitionToForeground):
+        * NetworkProcess/watchos/NetworkProximityAssertion.h: Removed.
+        * NetworkProcess/watchos/NetworkProximityAssertion.mm: Removed.
+        * NetworkProcess/watchos/NetworkProximityManager.h: Removed.
+        * NetworkProcess/watchos/NetworkProximityManager.mm: Removed.
+        * SourcesCocoa.txt:
+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
+        (API::ProcessPoolConfiguration::copy):
+        * UIProcess/API/APIProcessPoolConfiguration.h:
+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+        (-[_WKProcessPoolConfiguration wirelessContextIdentifier]):
+        (-[_WKProcessPoolConfiguration setWirelessContextIdentifier:]):
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+        * WebKit.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2019-03-23  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, fix typo in comment added in r243379.
</span></span></pre></div>
<a id="trunkSourceWebKitConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Configurations/WebKit.xcconfig       2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig  2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -105,9 +105,6 @@
</span><span class="cx"> WK_PDFKIT_LDFLAGS_iphonesimulator = $(WK_PDFKIT_LDFLAGS_iphoneos);
</span><span class="cx"> WK_PDFKIT_LDFLAGS_iphonesimulator[sdk=iphone*11.*] = ;
</span><span class="cx"> 
</span><del>-WK_PROXIMITY_NETWORKING_LDFLAGS = $(WK_PROXIMITY_NETWORKING_LDFLAGS_$(WK_PLATFORM_NAME));
-WK_PROXIMITY_NETWORKING_LDFLAGS_watchos = -framework IDS -framework MobileWiFi -framework SystemConfiguration -framework WirelessCoexManager;
-
</del><span class="cx"> WK_SAFE_BROWSING_LDFLAGS = $(WK_SAFE_BROWSING_LDFLAGS_$(WK_PLATFORM_NAME));
</span><span class="cx"> WK_SAFE_BROWSING_LDFLAGS_iphoneos = -framework SafariSafeBrowsing;
</span><span class="cx"> WK_SAFE_BROWSING_LDFLAGS_iphoneos[sdk=iphone*10.*] = ;
</span><span class="lines">@@ -130,7 +127,7 @@
</span><span class="cx"> WK_WEBINSPECTORUI_LDFLAGS = $(WK_WEBINSPECTORUI_LDFLAGS_$(WK_PLATFORM_NAME));
</span><span class="cx"> WK_WEBINSPECTORUI_LDFLAGS_macosx = -weak_framework WebInspectorUI;
</span><span class="cx"> 
</span><del>-FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PDF_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_PROXIMITY_NETWORKING_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
</del><ins>+FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PDF_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
</ins><span class="cx"> 
</span><span class="cx"> // Prevent C++ standard library basic_stringstream, operator new, delete and their related exception types from being exported as weak symbols.
</span><span class="cx"> UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEE
 ED1Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol -Wl,__ZTVNSt3__117bad_function_callE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEE
 NS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE;
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp    2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp       2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><span class="cx"> #include "NetworkProcessPlatformStrategies.h"
</span><span class="cx"> #include "NetworkProcessProxyMessages.h"
</span><del>-#include "NetworkProximityManager.h"
</del><span class="cx"> #include "NetworkResourceLoader.h"
</span><span class="cx"> #include "NetworkSession.h"
</span><span class="cx"> #include "NetworkSessionCreationParameters.h"
</span><span class="lines">@@ -145,9 +144,6 @@
</span><span class="cx"> #if PLATFORM(COCOA) || USE(SOUP)
</span><span class="cx">     LegacyCustomProtocolManager::networkProcessCreated(*this);
</span><span class="cx"> #endif
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    addSupplement<NetworkProximityManager>();
-#endif
</del><span class="cx"> 
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx">     DNSResolveQueueSoup::setGlobalDefaultNetworkStorageSessionAccessor([this]() -> NetworkStorageSession& {
</span><span class="lines">@@ -183,13 +179,6 @@
</span><span class="cx">     return m_downloadManager;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-NetworkProximityManager& NetworkProcess::proximityManager()
-{
-    return *supplement<NetworkProximityManager>();
-}
-#endif
-
</del><span class="cx"> void NetworkProcess::removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess& connection)
</span><span class="cx"> {
</span><span class="cx">     auto count = m_webProcessConnections.removeAllMatching([&] (const auto& c) {
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h      2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -154,9 +154,6 @@
</span><span class="cx"> 
</span><span class="cx">     AuthenticationManager& authenticationManager();
</span><span class="cx">     DownloadManager& downloadManager();
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    NetworkProximityManager& proximityManager();
-#endif
</del><span class="cx"> 
</span><span class="cx">     NetworkCache::Cache* cache() { return m_cache.get(); }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp  2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp     2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -85,10 +85,6 @@
</span><span class="cx">     encoder << urlSchemesRegisteredAsCORSEnabled;
</span><span class="cx">     encoder << urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
</span><span class="cx"> 
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    encoder << wirelessContextIdentifier;
-#endif
-
</del><span class="cx"> #if ENABLE(SERVICE_WORKER)
</span><span class="cx">     encoder << serviceWorkerRegistrationDirectory << serviceWorkerRegistrationDirectoryExtensionHandle << urlSchemesServiceWorkersCanHandle << shouldDisableServiceWorkerProcessTerminationDelay;
</span><span class="cx"> #endif
</span><span class="lines">@@ -195,11 +191,6 @@
</span><span class="cx">     if (!decoder.decode(result.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    if (!decoder.decode(result.wirelessContextIdentifier))
-        return false;
-#endif
-
</del><span class="cx"> #if ENABLE(SERVICE_WORKER)
</span><span class="cx">     if (!decoder.decode(result.serviceWorkerRegistrationDirectory))
</span><span class="cx">         return false;
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h    2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h       2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -100,10 +100,6 @@
</span><span class="cx">     Vector<String> urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
</span><span class="cx">     Vector<String> urlSchemesRegisteredAsCORSEnabled;
</span><span class="cx"> 
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    unsigned wirelessContextIdentifier { 0 };
-#endif
-
</del><span class="cx"> #if ENABLE(SERVICE_WORKER)
</span><span class="cx">     String serviceWorkerRegistrationDirectory;
</span><span class="cx">     SandboxExtension::Handle serviceWorkerRegistrationDirectoryExtensionHandle;
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesscocoaNetworkDataTaskCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h  2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h     2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "NetworkActivityTracker.h"
</span><span class="cx"> #include "NetworkDataTask.h"
</span><span class="cx"> #include "NetworkLoadParameters.h"
</span><del>-#include "NetworkProximityAssertion.h"
</del><span class="cx"> #include <WebCore/NetworkLoadMetrics.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><span class="lines">@@ -73,14 +72,6 @@
</span><span class="cx">     uint64_t frameID() const { return m_frameID; };
</span><span class="cx">     uint64_t pageID() const { return m_pageID; };
</span><span class="cx"> 
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    void holdProximityAssertion(NetworkProximityAssertion& assertion)
-    {
-        ASSERT(!m_proximityAssertionToken);
-        m_proximityAssertionToken.emplace(assertion);
-    }
-#endif
-
</del><span class="cx">     String description() const override;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="lines">@@ -107,10 +98,6 @@
</span><span class="cx"> #if ENABLE(RESOURCE_LOAD_STATISTICS)
</span><span class="cx">     bool m_hasBeenSetToUseStatelessCookieStorage { false };
</span><span class="cx"> #endif
</span><del>-
-#if ENABLE(PROXIMITY_NETWORKING)
-    Optional<NetworkProximityAssertion::Token> m_proximityAssertionToken;
-#endif
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> WebCore::Credential serverTrustCredential(const WebCore::AuthenticationChallenge&);
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesscocoaNetworkDataTaskCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm    2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #import "DownloadProxyMessages.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "NetworkProcess.h"
</span><del>-#import "NetworkProximityManager.h"
</del><span class="cx"> #import "NetworkSessionCocoa.h"
</span><span class="cx"> #import "WebCoreArgumentCoders.h"
</span><span class="cx"> #import <WebCore/AuthenticationChallenge.h>
</span><span class="lines">@@ -200,9 +199,6 @@
</span><span class="cx"> 
</span><span class="cx">     NSURLRequest *nsRequest = request.nsURLRequest(WebCore::HTTPBodyUpdatePolicy::UpdateHTTPBody);
</span><span class="cx">     applySniffingPoliciesAndBindRequestToInferfaceIfNeeded(nsRequest, shouldContentSniff == WebCore::ContentSniffingPolicy::SniffContent && !url.isLocalFile(), shouldContentEncodingSniff == WebCore::ContentEncodingSniffingPolicy::Sniff);
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    m_session->networkProcess().proximityManager().applyProperties(request, *this, nsRequest);
-#endif
</del><span class="cx"> 
</span><span class="cx">     auto& cocoaSession = static_cast<NetworkSessionCocoa&>(m_session.get());
</span><span class="cx">     if (storedCredentialsPolicy == WebCore::StoredCredentialsPolicy::Use) {
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm  2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm     2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "NetworkCache.h"
</span><span class="cx"> #import "NetworkProcessCreationParameters.h"
</span><del>-#import "NetworkProximityManager.h"
</del><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="cx"> #import "NetworkSessionCocoa.h"
</span><span class="cx"> #import "SandboxExtension.h"
</span><span class="lines">@@ -247,32 +246,19 @@
</span><span class="cx"> 
</span><span class="cx"> void NetworkProcess::platformPrepareToSuspend(CompletionHandler<void()>&& completionHandler)
</span><span class="cx"> {
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    proximityManager().suspend(SuspensionReason::ProcessSuspending, WTFMove(completionHandler));
-#else
</del><span class="cx">     completionHandler();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void NetworkProcess::platformProcessDidResume()
</span><span class="cx"> {
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    proximityManager().resume(ResumptionReason::ProcessResuming);
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void NetworkProcess::platformProcessDidTransitionToBackground()
</span><span class="cx"> {
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    proximityManager().suspend(SuspensionReason::ProcessBackgrounding, [] { });
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void NetworkProcess::platformProcessDidTransitionToForeground()
</span><span class="cx"> {
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    proximityManager().resume(ResumptionReason::ProcessForegrounding);
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitSourcesCocoatxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/SourcesCocoa.txt (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/SourcesCocoa.txt     2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/SourcesCocoa.txt        2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -48,9 +48,6 @@
</span><span class="cx"> NetworkProcess/mac/NetworkProcessMac.mm
</span><span class="cx"> NetworkProcess/mac/RemoteNetworkingContext.mm
</span><span class="cx"> 
</span><del>-NetworkProcess/watchos/NetworkProximityAssertion.mm
-NetworkProcess/watchos/NetworkProximityManager.mm
-
</del><span class="cx"> NetworkProcess/webrtc/LibWebRTCSocketClient.cpp
</span><span class="cx"> NetworkProcess/webrtc/NetworkRTCMonitor.cpp
</span><span class="cx"> NetworkProcess/webrtc/NetworkRTCProvider.cpp
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIAPIProcessPoolConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp        2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp   2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -126,9 +126,6 @@
</span><span class="cx">     copy->m_processSwapsOnWindowOpenWithOpener = this->m_processSwapsOnWindowOpenWithOpener;
</span><span class="cx">     copy->m_isAutomaticProcessWarmingEnabledByClient = this->m_isAutomaticProcessWarmingEnabledByClient;
</span><span class="cx">     copy->m_usesWebProcessCache = this->m_usesWebProcessCache;
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    copy->m_wirelessContextIdentifier = this->m_wirelessContextIdentifier;
-#endif
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     copy->m_suppressesConnectionTerminationOnSystemChange = this->m_suppressesConnectionTerminationOnSystemChange;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h  2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h     2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -180,11 +180,6 @@
</span><span class="cx">     const WTF::String& customWebContentServiceBundleIdentifier() const { return m_customWebContentServiceBundleIdentifier; }
</span><span class="cx">     void setCustomWebContentServiceBundleIdentifier(const WTF::String& customWebContentServiceBundleIdentifier) { m_customWebContentServiceBundleIdentifier = customWebContentServiceBundleIdentifier; }
</span><span class="cx"> 
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    unsigned wirelessContextIdentifier() const { return m_wirelessContextIdentifier; }
-    void setWirelessContextIdentifier(unsigned wirelessContextIdentifier) { m_wirelessContextIdentifier = wirelessContextIdentifier; }
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     bool suppressesConnectionTerminationOnSystemChange() const { return m_suppressesConnectionTerminationOnSystemChange; }
</span><span class="cx">     void setSuppressesConnectionTerminationOnSystemChange(bool suppressesConnectionTerminationOnSystemChange) { m_suppressesConnectionTerminationOnSystemChange = suppressesConnectionTerminationOnSystemChange; }
</span><span class="lines">@@ -237,10 +232,6 @@
</span><span class="cx">     WTF::String m_ctDataConnectionServiceType;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    unsigned m_wirelessContextIdentifier { 0 };
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     bool m_suppressesConnectionTerminationOnSystemChange { false };
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h    2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h       2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> @property (nonatomic, copy) NSArray<NSURL *> *additionalReadAccessAllowedURLs WK_API_AVAILABLE(macos(10.13), ios(11.0));
</span><span class="cx"> 
</span><span class="cx"> #if TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
</span><del>-@property (nonatomic) NSUInteger wirelessContextIdentifier;
</del><ins>+@property (nonatomic) NSUInteger wirelessContextIdentifier WK_API_DEPRECATED("Use of this API is no longer necessary and can be removed", ios(10.12, WK_IOS_TBA));
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> // Network Process properties
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKProcessPoolConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm   2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm      2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -137,15 +137,14 @@
</span><span class="cx">     _processPoolConfiguration->setAdditionalReadAccessAllowedPaths(WTFMove(paths));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
</del><ins>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
</ins><span class="cx"> - (NSUInteger)wirelessContextIdentifier
</span><span class="cx"> {
</span><del>-    return _processPoolConfiguration->wirelessContextIdentifier();
</del><ins>+    return 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)setWirelessContextIdentifier:(NSUInteger)identifier
</span><span class="cx"> {
</span><del>-    _processPoolConfiguration->setWirelessContextIdentifier(identifier);
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm       2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm  2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -296,10 +296,6 @@
</span><span class="cx">     parameters.storageAccessAPIEnabled = storageAccessAPIEnabled();
</span><span class="cx">     parameters.suppressesConnectionTerminationOnSystemChange = m_configuration->suppressesConnectionTerminationOnSystemChange();
</span><span class="cx"> 
</span><del>-#if ENABLE(PROXIMITY_NETWORKING)
-    parameters.wirelessContextIdentifier = m_configuration->wirelessContextIdentifier();
-#endif
-
</del><span class="cx">     parameters.shouldEnableITPDatabase = [defaults boolForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isITPDatabaseEnabledKey().createCFString().get()]];
</span><span class="cx">     parameters.downloadMonitorSpeedMultiplier = m_configuration->downloadMonitorSpeedMultiplier();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj     2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -1283,8 +1283,6 @@
</span><span class="cx">          A102A7081EC0EEE900D81D82 /* com.macromedia.Flash Player ESR.plugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7A5E39491D5BD8A700B4B7CE /* com.macromedia.Flash Player ESR.plugin.sb */; };
</span><span class="cx">          A1046EA12079263100F0C5D8 /* WKPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = A1046E9F2079263100F0C5D8 /* WKPDFView.h */; };
</span><span class="cx">          A105D0D1212734B20034F6C7 /* NetworkBlobRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = A105D0D0212734B10034F6C7 /* NetworkBlobRegistry.h */; };
</span><del>-               A11455AC211FCFCA00CA935B /* NetworkProximityAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = A11455AA211FCFCA00CA935B /* NetworkProximityAssertion.h */; };
-               A11455B0211FD25200CA935B /* NetworkProximityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A11455AE211FD25200CA935B /* NetworkProximityManager.h */; };
</del><span class="cx">           A115DC72191D82DA00DA8072 /* _WKWebViewPrintFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = A115DC6E191D82AB00DA8072 /* _WKWebViewPrintFormatter.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          A118A9EF1907AD6F00F7C92B /* QuickLookDocumentData.h in Headers */ = {isa = PBXBuildFile; fileRef = A118A9ED1907AD6F00F7C92B /* QuickLookDocumentData.h */; };
</span><span class="cx">          A118A9F31908B8EA00F7C92B /* _WKNSFileManagerExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = A118A9F11908B8EA00F7C92B /* _WKNSFileManagerExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -3873,10 +3871,6 @@
</span><span class="cx">          A1046E9F2079263100F0C5D8 /* WKPDFView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKPDFView.h; path = ios/WKPDFView.h; sourceTree = "<group>"; };
</span><span class="cx">          A1046EA02079263100F0C5D8 /* WKPDFView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKPDFView.mm; path = ios/WKPDFView.mm; sourceTree = "<group>"; };
</span><span class="cx">          A105D0D0212734B10034F6C7 /* NetworkBlobRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkBlobRegistry.h; sourceTree = "<group>"; };
</span><del>-               A11455AA211FCFCA00CA935B /* NetworkProximityAssertion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NetworkProximityAssertion.h; sourceTree = "<group>"; };
-               A11455AB211FCFCA00CA935B /* NetworkProximityAssertion.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkProximityAssertion.mm; sourceTree = "<group>"; };
-               A11455AE211FD25200CA935B /* NetworkProximityManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NetworkProximityManager.h; sourceTree = "<group>"; };
-               A11455AF211FD25200CA935B /* NetworkProximityManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkProximityManager.mm; sourceTree = "<group>"; };
</del><span class="cx">           A115DC6D191D82AB00DA8072 /* _WKWebViewPrintFormatter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKWebViewPrintFormatter.mm; sourceTree = "<group>"; };
</span><span class="cx">          A115DC6E191D82AB00DA8072 /* _WKWebViewPrintFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebViewPrintFormatter.h; sourceTree = "<group>"; };
</span><span class="cx">          A118A9EC1907AD6F00F7C92B /* QuickLookDocumentData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = QuickLookDocumentData.cpp; path = ios/QuickLookDocumentData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -6521,7 +6515,6 @@
</span><span class="cx">                          2DA944BB188511DD00ED86DB /* ios */,
</span><span class="cx">                          510CC7DC16138E2900D03ED3 /* mac */,
</span><span class="cx">                          93BA04D92151ADCD007F455F /* ServiceWorker */,
</span><del>-                               A11455A1211FCE7F00CA935B /* watchos */,
</del><span class="cx">                           413075971DE84ED70039EC69 /* webrtc */,
</span><span class="cx">                          53F3CAA5206C443E0086490E /* NetworkActivityTracker.cpp */,
</span><span class="cx">                          535BCB902069C49C00CCCE02 /* NetworkActivityTracker.h */,
</span><span class="lines">@@ -7186,17 +7179,6 @@
</span><span class="cx">                  path = cocoa;
</span><span class="cx">                  sourceTree = "<group>";
</span><span class="cx">          };
</span><del>-               A11455A1211FCE7F00CA935B /* watchos */ = {
-                       isa = PBXGroup;
-                       children = (
-                               A11455AA211FCFCA00CA935B /* NetworkProximityAssertion.h */,
-                               A11455AB211FCFCA00CA935B /* NetworkProximityAssertion.mm */,
-                               A11455AE211FD25200CA935B /* NetworkProximityManager.h */,
-                               A11455AF211FD25200CA935B /* NetworkProximityManager.mm */,
-                       );
-                       path = watchos;
-                       sourceTree = "<group>";
-               };
</del><span class="cx">           A182D5B11BE6BCF40087A7CC /* ios */ = {
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span><span class="lines">@@ -9309,8 +9291,6 @@
</span><span class="cx">                          5179556E162877B300FA43B6 /* NetworkProcessProxy.h in Headers */,
</span><span class="cx">                          513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */,
</span><span class="cx">                          5C1426EE1C23F80900D41183 /* NetworkProcessSupplement.h in Headers */,
</span><del>-                               A11455AC211FCFCA00CA935B /* NetworkProximityAssertion.h in Headers */,
-                               A11455B0211FD25200CA935B /* NetworkProximityManager.h in Headers */,
</del><span class="cx">                           51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */,
</span><span class="cx">                          E152551B17011819003D7ADB /* NetworkResourceLoaderMessages.h in Headers */,
</span><span class="cx">                          51240EC0220B694C005CFC63 /* NetworkResourceLoadMap.h in Headers */,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Tools/ChangeLog       2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-03-24  Andy Estes  <aestes@apple.com>
+
+        [watchOS] Remove unused Proximity Networking code
+        https://bugs.webkit.org/show_bug.cgi?id=196188
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm:
+        (TEST):
+
</ins><span class="cx"> 2019-03-23  Keith Miller  <keith_miller@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Refactor clz/ctz and fix getLSBSet.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaWKProcessPoolConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm (243426 => 243427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm        2019-03-24 20:23:32 UTC (rev 243426)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm   2019-03-24 20:42:37 UTC (rev 243427)
</span><span class="lines">@@ -38,9 +38,6 @@
</span><span class="cx">     [configuration setIgnoreSynchronousMessagingTimeoutsForTesting:YES];
</span><span class="cx">     [configuration setAttrStyleEnabled:YES];
</span><span class="cx">     [configuration setAdditionalReadAccessAllowedURLs:@[ [NSURL fileURLWithPath:@"/path/to/allow/read/access/"] ]];
</span><del>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
-    [configuration setWirelessContextIdentifier:25];
-#endif
</del><span class="cx">     [configuration setDiskCacheSizeOverride:42000];
</span><span class="cx">     [configuration setCachePartitionedURLSchemes:@[ @"ssh", @"vnc" ]];
</span><span class="cx">     [configuration setAlwaysRevalidatedURLSchemes:@[ @"afp", @"smb" ]];
</span><span class="lines">@@ -66,9 +63,6 @@
</span><span class="cx">     EXPECT_EQ([configuration ignoreSynchronousMessagingTimeoutsForTesting], [copy ignoreSynchronousMessagingTimeoutsForTesting]);
</span><span class="cx">     EXPECT_EQ([configuration attrStyleEnabled], [copy attrStyleEnabled]);
</span><span class="cx">     EXPECT_TRUE([[configuration additionalReadAccessAllowedURLs] isEqual:[copy additionalReadAccessAllowedURLs]]);
</span><del>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
-    EXPECT_EQ([configuration wirelessContextIdentifier], [copy wirelessContextIdentifier]);
-#endif
</del><span class="cx">     EXPECT_EQ([configuration diskCacheSizeOverride], [copy diskCacheSizeOverride]);
</span><span class="cx">     EXPECT_TRUE([[configuration cachePartitionedURLSchemes] isEqual:[copy cachePartitionedURLSchemes]]);
</span><span class="cx">     EXPECT_TRUE([[configuration alwaysRevalidatedURLSchemes] isEqual:[copy alwaysRevalidatedURLSchemes]]);
</span></span></pre>
</div>
</div>

</body>
</html>