<!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>[166223] tags/Safari-538.24.2/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/166223">166223</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-03-24 23:24:13 -0700 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/166103">r166103</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari538242SourceWebKit2ChangeLog">tags/Safari-538.24.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari538242SourceWebKit2ConfigurationsNetworkProcessxcconfig">tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkProcess.xcconfig</a></li>
<li><a href="#tagsSafari538242SourceWebKit2ConfigurationsNetworkServiceDevelopmentxcconfig">tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig</a></li>
<li><a href="#tagsSafari538242SourceWebKit2ConfigurationsNetworkServicexcconfig">tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.xcconfig</a></li>
<li><a href="#tagsSafari538242SourceWebKit2ConfigurationsWebContentiOSentitlements">tags/Safari-538.24.2/Source/WebKit2/Configurations/WebContent-iOS.entitlements</a></li>
<li><a href="#tagsSafari538242SourceWebKit2NetworkProcessmacRemoteNetworkingContextmm">tags/Safari-538.24.2/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm</a></li>
<li><a href="#tagsSafari538242SourceWebKit2PlatformIPCConnectionh">tags/Safari-538.24.2/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#tagsSafari538242SourceWebKit2PlatformIPCmacConnectionMaccpp">tags/Safari-538.24.2/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp</a></li>
<li><a href="#tagsSafari538242SourceWebKit2WebKit2xcodeprojprojectpbxproj">tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#tagsSafari538242SourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm">tags/Safari-538.24.2/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari538242SourceWebKit2ConfigurationsNetworkiOSentitlements">tags/Safari-538.24.2/Source/WebKit2/Configurations/Network-iOS.entitlements</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari538242SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/ChangeLog (166222 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/ChangeLog 2014-03-25 06:18:51 UTC (rev 166222)
+++ tags/Safari-538.24.2/Source/WebKit2/ChangeLog 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-03-24 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r166103
+
+ 2014-03-21 Sam Weinig <sam@webkit.org>
+
+ [WebKit2] Implement NetworkingContext::sourceApplicationAuditData() for WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=130528
+
+ Reviewed by Tim Horton.
+
+ * Platform/IPC/Connection.h:
+ * Platform/IPC/mac/ConnectionMac.cpp:
+ (IPC::Connection::getAuditToken):
+ Expose the audit data if available.
+
+ * NetworkProcess/mac/RemoteNetworkingContext.mm:
+ (WebKit::RemoteNetworkingContext::sourceApplicationAuditData):
+ * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
+ (WebKit::WebFrameNetworkingContext::sourceApplicationAuditData):
+ Pass the audit data corresponding to the UIProcess.
+
+ * Configurations/Network-iOS.entitlements: Copied from Configurations/WebContent-iOS.entitlements.
+ * Configurations/NetworkProcess.xcconfig:
+ * Configurations/NetworkService.Development.xcconfig:
+ * Configurations/NetworkService.xcconfig:
+ * Configurations/WebContent-iOS.entitlements:
+ Add entitlement allowing the audit data to be used.
+
+2014-03-24 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r165983
</span><span class="cx">
</span><span class="cx"> 2014-03-20 Sam Weinig <sam@webkit.org>
</span></span></pre></div>
<a id="tagsSafari538242SourceWebKit2ConfigurationsNetworkiOSentitlementsfromrev166103trunkSourceWebKit2ConfigurationsNetworkiOSentitlements"></a>
<div class="copfile"><h4>Copied: tags/Safari-538.24.2/Source/WebKit2/Configurations/Network-iOS.entitlements (from rev 166103, trunk/Source/WebKit2/Configurations/Network-iOS.entitlements) (0 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/Configurations/Network-iOS.entitlements (rev 0)
+++ tags/Safari-538.24.2/Source/WebKit2/Configurations/Network-iOS.entitlements 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.private.network.socket-delegate</key>
+ <true/>
+</dict>
+</plist>
</ins></span></pre></div>
<a id="tagsSafari538242SourceWebKit2ConfigurationsNetworkProcessxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkProcess.xcconfig (166222 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2014-03-25 06:18:51 UTC (rev 166222)
+++ tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -29,3 +29,6 @@
</span><span class="cx"> EXCLUDED_SHIM_FILE_NAME = $(EXCLUDED_SHIM_FILE_NAME_$(PLATFORM_NAME));
</span><span class="cx"> EXCLUDED_SHIM_FILE_NAME_iphoneos = SecItemShim.dylib;
</span><span class="cx"> EXCLUDED_SHIM_FILE_NAME_iphonesimulator = $(EXCLUDED_SHIM_FILE_NAME_iphoneos);
</span><ins>+
+CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements
+CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements
</ins></span></pre></div>
<a id="tagsSafari538242SourceWebKit2ConfigurationsNetworkServiceDevelopmentxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig (166222 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2014-03-25 06:18:51 UTC (rev 166222)
+++ tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -29,3 +29,6 @@
</span><span class="cx"> INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
</span><span class="cx"> INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-OSX.plist;
</span><span class="cx"> INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist;
</span><ins>+
+CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements
+CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements
</ins></span></pre></div>
<a id="tagsSafari538242SourceWebKit2ConfigurationsNetworkServicexcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.xcconfig (166222 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.xcconfig 2014-03-25 06:18:51 UTC (rev 166222)
+++ tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.xcconfig 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -29,3 +29,6 @@
</span><span class="cx"> INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
</span><span class="cx"> INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
</span><span class="cx"> INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
</span><ins>+
+CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements
+CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements
</ins></span></pre></div>
<a id="tagsSafari538242SourceWebKit2ConfigurationsWebContentiOSentitlements"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/Configurations/WebContent-iOS.entitlements (166222 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/Configurations/WebContent-iOS.entitlements 2014-03-25 06:18:51 UTC (rev 166222)
+++ tags/Safari-538.24.2/Source/WebKit2/Configurations/WebContent-iOS.entitlements 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -2,15 +2,17 @@
</span><span class="cx"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span class="cx"> <plist version="1.0">
</span><span class="cx"> <dict>
</span><del>- <key>com.apple.private.allow-explicit-graphics-priority</key>
- <true/>
- <key>com.apple.private.webinspector.allow-remote-inspection</key>
- <true/>
- <key>dynamic-codesigning</key>
- <true/>
- <key>com.apple.private.assets.accessible-asset-types</key>
- <array>
- <string>com.apple.MobileAsset.WebKitBlocklist</string>
- </array>
</del><ins>+ <key>com.apple.private.allow-explicit-graphics-priority</key>
+ <true/>
+ <key>com.apple.private.network.socket-delegate</key>
+ <true/>
+ <key>com.apple.private.webinspector.allow-remote-inspection</key>
+ <true/>
+ <key>dynamic-codesigning</key>
+ <true/>
+ <key>com.apple.private.assets.accessible-asset-types</key>
+ <array>
+ <string>com.apple.MobileAsset.WebKitBlocklist</string>
+ </array>
</ins><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre></div>
<a id="tagsSafari538242SourceWebKit2NetworkProcessmacRemoteNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm (166222 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2014-03-25 06:18:51 UTC (rev 166222)
+++ tags/Safari-538.24.2/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "RemoteNetworkingContext.h"
</span><span class="cx">
</span><ins>+#import "NetworkProcess.h"
</ins><span class="cx"> #import "SessionTracker.h"
</span><span class="cx"> #import "WebErrors.h"
</span><span class="cx"> #import <WebCore/ResourceError.h>
</span><span class="lines">@@ -69,7 +70,14 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFDataRef> RemoteNetworkingContext::sourceApplicationAuditData() const
</span><span class="cx"> {
</span><del>- return nil;
</del><ins>+#if PLATFORM(IOS)
+ audit_token_t auditToken;
+ if (!NetworkProcess::shared().parentProcessConnection()->getAuditToken(auditToken))
+ return nullptr;
+ return adoptCF(CFDataCreate(0, (const UInt8*)&auditToken, sizeof(auditToken)));
+#else
+ return nullptr;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceError RemoteNetworkingContext::blockedError(const ResourceRequest& request) const
</span></span></pre></div>
<a id="tagsSafari538242SourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/Platform/IPC/Connection.h (166222 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/Platform/IPC/Connection.h 2014-03-25 06:18:51 UTC (rev 166222)
+++ tags/Safari-538.24.2/Source/WebKit2/Platform/IPC/Connection.h 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> };
</span><span class="cx"> static bool identifierIsNull(Identifier identifier) { return identifier.port == MACH_PORT_NULL; }
</span><span class="cx"> xpc_connection_t xpcConnection() { return m_xpcConnection; }
</span><del>-
</del><ins>+ bool getAuditToken(audit_token_t&);
</ins><span class="cx"> #elif USE(UNIX_DOMAIN_SOCKETS)
</span><span class="cx"> typedef int Identifier;
</span><span class="cx"> static bool identifierIsNull(Identifier identifier) { return !identifier; }
</span></span></pre></div>
<a id="tagsSafari538242SourceWebKit2PlatformIPCmacConnectionMaccpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp (166222 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp 2014-03-25 06:18:51 UTC (rev 166222)
+++ tags/Safari-538.24.2/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -35,6 +35,12 @@
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <xpc/xpc.h>
</span><span class="cx">
</span><ins>+#if __has_include(<xpc/private.h>)
+#include <xpc/private.h>
+#endif
+
+extern "C" void xpc_connection_get_audit_token(xpc_connection_t, audit_token_t*);
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx">
</span><span class="cx"> static const size_t inlineMessageMaxSize = 4096;
</span><span class="lines">@@ -511,4 +517,13 @@
</span><span class="cx"> return Identifier(m_isServer ? m_receivePort : m_sendPort, m_xpcConnection);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Connection::getAuditToken(audit_token_t& auditToken)
+{
+ if (!m_xpcConnection)
+ return false;
+
+ xpc_connection_get_audit_token(m_xpcConnection, &auditToken);
+ return true;
+}
+
</ins><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="tagsSafari538242SourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (166222 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-03-25 06:18:51 UTC (rev 166222)
+++ tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -2739,6 +2739,9 @@
</span><span class="cx"> 762B7484120BBA2D00819339 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 7801C095142290C400FAF9AF /* WebHitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHitTestResult.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7801C096142290C400FAF9AF /* WebHitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHitTestResult.h; sourceTree = "<group>"; };
</span><ins>+ 7C0BB9A718DCDE890006C086 /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
+ 7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "WebContent-iOS.entitlements"; sourceTree = "<group>"; };
+ 7C0BB9A918DCDF5A0006C086 /* Network-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Network-iOS.entitlements"; sourceTree = "<group>"; };
</ins><span class="cx"> 7C135AA6173B0BCA00586AE2 /* WKPluginInformation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKPluginInformation.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C135AA7173B0BCA00586AE2 /* WKPluginInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPluginInformation.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C135AAA173B0CFF00586AE2 /* PluginInformationMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginInformationMac.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -3791,6 +3794,8 @@
</span><span class="cx"> 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */,
</span><span class="cx"> 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
</span><span class="cx"> 1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
</span><ins>+ 7C0BB9A718DCDE890006C086 /* iOS.xcconfig */,
+ 7C0BB9A918DCDF5A0006C086 /* Network-iOS.entitlements */,
</ins><span class="cx"> 510CC8461613C7C600D03ED3 /* NetworkProcess.xcconfig */,
</span><span class="cx"> BC8283AA16B4BEAD00A278FE /* NetworkService.Development.xcconfig */,
</span><span class="cx"> BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */,
</span><span class="lines">@@ -3803,6 +3808,7 @@
</span><span class="cx"> A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
</span><span class="cx"> 5183B3931379F85C00E8754E /* Shim.xcconfig */,
</span><span class="cx"> 1A4F976E100E7B6600637A18 /* Version.xcconfig */,
</span><ins>+ 7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */,
</ins><span class="cx"> 5DAD7294116FF70B00EE5396 /* WebContentProcess.xcconfig */,
</span><span class="cx"> BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */,
</span><span class="cx"> BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
</span></span></pre></div>
<a id="tagsSafari538242SourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (166222 => 166223)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2014-03-25 06:18:51 UTC (rev 166222)
+++ tags/Safari-538.24.2/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2014-03-25 06:24:13 UTC (rev 166223)
</span><span class="lines">@@ -24,11 +24,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "WebFrameNetworkingContext.h"
</ins><span class="cx">
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><del>-#include "WebFrameNetworkingContext.h"
</del><span class="cx"> #include "WebPage.h"
</span><ins>+#include "WebProcess.h"
</ins><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/FrameLoader.h>
</span><span class="cx"> #include <WebCore/FrameLoaderClient.h>
</span><span class="lines">@@ -90,7 +91,14 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFDataRef> WebFrameNetworkingContext::sourceApplicationAuditData() const
</span><span class="cx"> {
</span><del>- return RetainPtr<CFDataRef>();
</del><ins>+#if PLATFORM(IOS)
+ audit_token_t auditToken;
+ if (!WebProcess::shared().parentProcessConnection()->getAuditToken(auditToken))
+ return nullptr;
+ return adoptCF(CFDataCreate(0, (const UInt8*)&auditToken, sizeof(auditToken)));
+#else
+ return nullptr;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceError WebFrameNetworkingContext::blockedError(const ResourceRequest& request) const
</span></span></pre>
</div>
</div>
</body>
</html>