<!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>[213750] tags/Safari-604.1.10/Source/WebKit2</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/213750">213750</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-10 21:51:50 -0800 (Fri, 10 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213747">r213747</a>. rdar://problem/29599569</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari604110SourceWebKit2ChangeLog">tags/Safari-604.1.10/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari604110SourceWebKit2NetworkProcessNetworkProcessCreationParameterscpp">tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#tagsSafari604110SourceWebKit2NetworkProcessNetworkProcessCreationParametersh">tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h</a></li>
<li><a href="#tagsSafari604110SourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#tagsSafari604110SourceWebKit2NetworkProcesscocoaNetworkSessionCocoah">tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.h</a></li>
<li><a href="#tagsSafari604110SourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
<li><a href="#tagsSafari604110SourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh">tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h</a></li>
<li><a href="#tagsSafari604110SourceWebKit2UIProcessAPICocoa_WKProcessPoolConfigurationh">tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h</a></li>
<li><a href="#tagsSafari604110SourceWebKit2UIProcessAPICocoa_WKProcessPoolConfigurationmm">tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari604110SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.10/Source/WebKit2/ChangeLog (213749 => 213750)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.10/Source/WebKit2/ChangeLog 2017-03-11 04:30:46 UTC (rev 213749)
+++ tags/Safari-604.1.10/Source/WebKit2/ChangeLog 2017-03-11 05:51:50 UTC (rev 213750)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2017-03-10 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><ins>+ Merge r213747. rdar://problem/29599569
+
+ 2017-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Add SPI to set NSURLSessionConfiguration.allowsCellularAccess from _WKProcessPoolConfiguration
+ https://bugs.webkit.org/show_bug.cgi?id=169500
+ <rdar://problem/29599569>
+
+ Reviewed by Joseph Pecoraro.
+
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.h:
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::globalAllowsCellularAccess):
+ (WebKit::NetworkSessionCocoa::setAllowsCellularAccess):
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+ (-[_WKProcessPoolConfiguration allowsCellularAccess]):
+ (-[_WKProcessPoolConfiguration setAllowsCellularAccess:]):
+
+2017-03-10 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Merge r213715. rdar://problem/24709033
</span><span class="cx">
</span><span class="cx"> 2017-03-10 Commit Queue <commit-queue@webkit.org>
</span></span></pre></div>
<a id="tagsSafari604110SourceWebKit2NetworkProcessNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp (213749 => 213750)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2017-03-11 04:30:46 UTC (rev 213749)
+++ tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2017-03-11 05:51:50 UTC (rev 213750)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> encoder << nsURLCacheDiskCapacity;
</span><span class="cx"> encoder << sourceApplicationBundleIdentifier;
</span><span class="cx"> encoder << sourceApplicationSecondaryIdentifier;
</span><ins>+ encoder << allowsCellularAccess;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> encoder << ctDataConnectionServiceType;
</span><span class="cx"> #endif
</span><span class="lines">@@ -163,6 +164,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.sourceApplicationSecondaryIdentifier))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(result.allowsCellularAccess))
+ return false;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (!decoder.decode(result.ctDataConnectionServiceType))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="tagsSafari604110SourceWebKit2NetworkProcessNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h (213749 => 213750)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2017-03-11 04:30:46 UTC (rev 213749)
+++ tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2017-03-11 05:51:50 UTC (rev 213750)
</span><span class="lines">@@ -84,6 +84,7 @@
</span><span class="cx"> uint64_t nsURLCacheDiskCapacity;
</span><span class="cx"> String sourceApplicationBundleIdentifier;
</span><span class="cx"> String sourceApplicationSecondaryIdentifier;
</span><ins>+ bool allowsCellularAccess { true };
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> String ctDataConnectionServiceType;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="tagsSafari604110SourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (213749 => 213750)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2017-03-11 04:30:46 UTC (rev 213749)
+++ tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2017-03-11 05:51:50 UTC (rev 213750)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> NetworkSessionCocoa::setSourceApplicationAuditTokenData(sourceApplicationAuditData());
</span><span class="cx"> NetworkSessionCocoa::setSourceApplicationBundleIdentifier(parameters.sourceApplicationBundleIdentifier);
</span><span class="cx"> NetworkSessionCocoa::setSourceApplicationSecondaryIdentifier(parameters.sourceApplicationSecondaryIdentifier);
</span><ins>+ NetworkSessionCocoa::setAllowsCellularAccess(parameters.allowsCellularAccess);
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> NetworkSessionCocoa::setCTDataConnectionServiceType(parameters.ctDataConnectionServiceType);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="tagsSafari604110SourceWebKit2NetworkProcesscocoaNetworkSessionCocoah"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.h (213749 => 213750)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.h 2017-03-11 04:30:46 UTC (rev 213749)
+++ tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.h 2017-03-11 05:51:50 UTC (rev 213750)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> static void setSourceApplicationAuditTokenData(RetainPtr<CFDataRef>&&);
</span><span class="cx"> static void setSourceApplicationBundleIdentifier(const String&);
</span><span class="cx"> static void setSourceApplicationSecondaryIdentifier(const String&);
</span><ins>+ static void setAllowsCellularAccess(bool);
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static void setCTDataConnectionServiceType(const String&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="tagsSafari604110SourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (213749 => 213750)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-03-11 04:30:46 UTC (rev 213749)
+++ tags/Safari-604.1.10/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-03-11 05:51:50 UTC (rev 213750)
</span><span class="lines">@@ -429,6 +429,12 @@
</span><span class="cx"> return [NSURLSessionConfiguration defaultSessionConfiguration];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool& globalAllowsCellularAccess()
+{
+ static bool allowsCellularAccess { true };
+ return allowsCellularAccess;
+}
+
</ins><span class="cx"> static LegacyCustomProtocolManager*& globalLegacyCustomProtocolManager()
</span><span class="cx"> {
</span><span class="cx"> static LegacyCustomProtocolManager* customProtocolManager { nullptr };
</span><span class="lines">@@ -488,6 +494,11 @@
</span><span class="cx"> ASSERT(!sessionsCreated);
</span><span class="cx"> globalSourceApplicationSecondaryIdentifier() = identifier;
</span><span class="cx"> }
</span><ins>+
+void NetworkSessionCocoa::setAllowsCellularAccess(bool value)
+{
+ globalAllowsCellularAccess() = value;
+}
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void NetworkSessionCocoa::setCTDataConnectionServiceType(const String& type)
</span><span class="lines">@@ -520,6 +531,9 @@
</span><span class="cx">
</span><span class="cx"> NSURLSessionConfiguration *configuration = configurationForSessionID(m_sessionID);
</span><span class="cx">
</span><ins>+ if (!globalAllowsCellularAccess())
+ configuration.allowsCellularAccess = NO;
+
</ins><span class="cx"> if (NetworkCache::singleton().isEnabled())
</span><span class="cx"> configuration.URLCache = nil;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari604110SourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (213749 => 213750)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2017-03-11 04:30:46 UTC (rev 213749)
+++ tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2017-03-11 05:51:50 UTC (rev 213750)
</span><span class="lines">@@ -111,6 +111,9 @@
</span><span class="cx"> const WTF::String& sourceApplicationSecondaryIdentifier() const { return m_sourceApplicationSecondaryIdentifier; }
</span><span class="cx"> void setSourceApplicationSecondaryIdentifier(const WTF::String& sourceApplicationSecondaryIdentifier) { m_sourceApplicationSecondaryIdentifier = sourceApplicationSecondaryIdentifier; }
</span><span class="cx">
</span><ins>+ bool allowsCellularAccess() const { return m_allowsCellularAccess; }
+ void setAllowsCellularAccess(bool allowsCellularAccess) { m_allowsCellularAccess = allowsCellularAccess; }
+
</ins><span class="cx"> bool alwaysRunsAtBackgroundPriority() const { return m_alwaysRunsAtBackgroundPriority; }
</span><span class="cx"> void setAlwaysRunsAtBackgroundPriority(bool alwaysRunsAtBackgroundPriority) { m_alwaysRunsAtBackgroundPriority = alwaysRunsAtBackgroundPriority; }
</span><span class="cx">
</span><span class="lines">@@ -145,6 +148,7 @@
</span><span class="cx"> Vector<WTF::String> m_overrideLanguages;
</span><span class="cx"> WTF::String m_sourceApplicationBundleIdentifier;
</span><span class="cx"> WTF::String m_sourceApplicationSecondaryIdentifier;
</span><ins>+ bool m_allowsCellularAccess { true };
</ins><span class="cx"> bool m_alwaysRunsAtBackgroundPriority { false };
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WTF::String m_ctDataConnectionServiceType;
</span></span></pre></div>
<a id="tagsSafari604110SourceWebKit2UIProcessAPICocoa_WKProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (213749 => 213750)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2017-03-11 04:30:46 UTC (rev 213749)
+++ tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2017-03-11 05:51:50 UTC (rev 213750)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> @property (nonatomic) BOOL diskCacheSpeculativeValidationEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><span class="cx"> @property (nonatomic, nullable, copy) NSString *sourceApplicationBundleIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><span class="cx"> @property (nonatomic, nullable, copy) NSString *sourceApplicationSecondaryIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><ins>+@property (nonatomic) BOOL allowsCellularAccess WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> @property (nonatomic, nullable, copy) NSString *CTDataConnectionServiceType WK_API_AVAILABLE(ios(WK_IOS_TBA));
</span><span class="cx"> @property (nonatomic) BOOL alwaysRunsAtBackgroundPriority WK_API_AVAILABLE(ios(WK_IOS_TBA));
</span></span></pre></div>
<a id="tagsSafari604110SourceWebKit2UIProcessAPICocoa_WKProcessPoolConfigurationmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (213749 => 213750)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2017-03-11 04:30:46 UTC (rev 213749)
+++ tags/Safari-604.1.10/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2017-03-11 05:51:50 UTC (rev 213750)
</span><span class="lines">@@ -171,6 +171,16 @@
</span><span class="cx"> _processPoolConfiguration->setSourceApplicationSecondaryIdentifier(sourceApplicationSecondaryIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)allowsCellularAccess
+{
+ return _processPoolConfiguration->allowsCellularAccess();
+}
+
+- (void)setAllowsCellularAccess:(BOOL)allowsCellularAccess
+{
+ _processPoolConfiguration->setAllowsCellularAccess(allowsCellularAccess);
+}
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (NSString *)CTDataConnectionServiceType
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>