<!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>[165985] trunk/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/165985">165985</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-03-20 12:32:50 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebKit2] Implement NetworkingContext::sourceApplicationAuditData() for WebKit2
https://bugs.webkit.org/show_bug.cgi?id=130528
Reviewed by Anders Carlsson.
* 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacRemoteNetworkingContextmm">trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMaccpp">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165984 => 165985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-20 19:32:16 UTC (rev 165984)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-20 19:32:50 UTC (rev 165985)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-03-20 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><ins>+ [WebKit2] Implement NetworkingContext::sourceApplicationAuditData() for WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=130528
+
+ Reviewed by Anders Carlsson.
+
+ * 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.
+
+2014-03-20 Sam Weinig <sam@webkit.org>
+
</ins><span class="cx"> [Cocoa] Expose preference to enable telephone number detection
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130524
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacRemoteNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm (165984 => 165985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2014-03-20 19:32:16 UTC (rev 165984)
+++ trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2014-03-20 19:32:50 UTC (rev 165985)
</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,11 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFDataRef> RemoteNetworkingContext::sourceApplicationAuditData() const
</span><span class="cx"> {
</span><del>- return nil;
</del><ins>+ audit_token_t auditToken;
+ if (!NetworkProcess::shared().parentProcessConnection()->getAuditToken(auditToken))
+ return nullptr;
+
+ return adoptCF(CFDataCreate(0, (const UInt8*)&auditToken, sizeof(auditToken)));
</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="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (165984 => 165985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-03-20 19:32:16 UTC (rev 165984)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-03-20 19:32:50 UTC (rev 165985)
</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="trunkSourceWebKit2PlatformIPCmacConnectionMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp (165984 => 165985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp 2014-03-20 19:32:16 UTC (rev 165984)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp 2014-03-20 19:32:50 UTC (rev 165985)
</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>
+#else
+extern "C" void xpc_connection_get_audit_token(xpc_connection_t, audit_token_t*);
+#endif
+
</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="trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (165984 => 165985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2014-03-20 19:32:16 UTC (rev 165984)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2014-03-20 19:32:50 UTC (rev 165985)
</span><span class="lines">@@ -24,10 +24,11 @@
</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><ins>+#include "WebProcess.h"
</ins><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/FrameLoader.h>
</span><span class="lines">@@ -90,7 +91,11 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFDataRef> WebFrameNetworkingContext::sourceApplicationAuditData() const
</span><span class="cx"> {
</span><del>- return RetainPtr<CFDataRef>();
</del><ins>+ audit_token_t auditToken;
+ if (!WebProcess::shared().parentProcessConnection()->getAuditToken(auditToken))
+ return nullptr;
+
+ return adoptCF(CFDataCreate(0, (const UInt8*)&auditToken, sizeof(auditToken)));
</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>