<!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>[209147] trunk/Source/WebCore</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/209147">209147</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2016-11-30 12:34:18 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Pass the embedding app's bundle ID to new instances of NEFilterSource
https://bugs.webkit.org/show_bug.cgi?id=165168
<rdar://problem/29003618>
Reviewed by Simon Fraser.
* platform/RuntimeApplicationChecks.h: Declared applicationBundleIdentifier().
* platform/RuntimeApplicationChecks.mm:
(WebCore::applicationBundleIdentifier): Made non-static.
* platform/cocoa/NetworkExtensionContentFilter.mm:
(WebCore::NetworkExtensionContentFilter::initialize): If the new NEFilterSource instance
responds to -setSourceAppBundleID:, call it with applicationBundleIdentifier().
* platform/spi/cocoa/NEFilterSourceSPI.h: Moved NEFilterSourceOptionsRedirectURL into the
!USE(APPLE_INTERNAL_SDK) section and unconditionally declared @property sourceAppBundleID in
a new category on NEFilterSource.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformRuntimeApplicationChecksh">trunk/Source/WebCore/platform/RuntimeApplicationChecks.h</a></li>
<li><a href="#trunkSourceWebCoreplatformRuntimeApplicationChecksmm">trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaNetworkExtensionContentFiltermm">trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNEFilterSourceSPIh">trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209146 => 209147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-30 20:30:16 UTC (rev 209146)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 20:34:18 UTC (rev 209147)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-11-30 Andy Estes <aestes@apple.com>
+
+ [Cocoa] Pass the embedding app's bundle ID to new instances of NEFilterSource
+ https://bugs.webkit.org/show_bug.cgi?id=165168
+ <rdar://problem/29003618>
+
+ Reviewed by Simon Fraser.
+
+ * platform/RuntimeApplicationChecks.h: Declared applicationBundleIdentifier().
+ * platform/RuntimeApplicationChecks.mm:
+ (WebCore::applicationBundleIdentifier): Made non-static.
+ * platform/cocoa/NetworkExtensionContentFilter.mm:
+ (WebCore::NetworkExtensionContentFilter::initialize): If the new NEFilterSource instance
+ responds to -setSourceAppBundleID:, call it with applicationBundleIdentifier().
+ * platform/spi/cocoa/NEFilterSourceSPI.h: Moved NEFilterSourceOptionsRedirectURL into the
+ !USE(APPLE_INTERNAL_SDK) section and unconditionally declared @property sourceAppBundleID in
+ a new category on NEFilterSource.
+
</ins><span class="cx"> 2016-11-30 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Use 'childOfType' template when retrieving Shadow DOM elements
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRuntimeApplicationChecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.h (209146 => 209147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2016-11-30 20:30:16 UTC (rev 209146)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2016-11-30 20:34:18 UTC (rev 209147)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setApplicationBundleIdentifier(const String&);
</span><ins>+String applicationBundleIdentifier();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRuntimeApplicationChecksmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm (209146 => 209147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm 2016-11-30 20:30:16 UTC (rev 209146)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm 2016-11-30 20:34:18 UTC (rev 209147)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> return identifier;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String applicationBundleIdentifier()
</del><ins>+String applicationBundleIdentifier()
</ins><span class="cx"> {
</span><span class="cx"> // The override only gets set in WebKit2's WebProcess and NetworkProcess. If unset, we use the main bundle identifier.
</span><span class="cx"> const auto& identifier = applicationBundleIdentifierOverride();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaNetworkExtensionContentFiltermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm (209146 => 209147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2016-11-30 20:30:16 UTC (rev 209146)
+++ trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2016-11-30 20:34:18 UTC (rev 209147)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "NEFilterSourceSPI.h"
</span><span class="cx"> #import "ResourceRequest.h"
</span><span class="cx"> #import "ResourceResponse.h"
</span><ins>+#import "RuntimeApplicationChecks.h"
</ins><span class="cx"> #import "SharedBuffer.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import "URL.h"
</span><span class="lines">@@ -73,6 +74,11 @@
</span><span class="cx"> #if HAVE(MODERN_NE_FILTER_SOURCE)
</span><span class="cx"> ASSERT_UNUSED(url, !url);
</span><span class="cx"> m_neFilterSource = adoptNS([allocNEFilterSourceInstance() initWithDecisionQueue:m_queue.get()]);
</span><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+ // FIXME: Remove the -respondsToSelector: check once -setSourceAppBundleID: is in an SDK (<rdar://problem/29147174>).
+ if ([m_neFilterSource respondsToSelector:@selector(setSourceAppBundleID:)])
+ [m_neFilterSource setSourceAppBundleID:applicationBundleIdentifier()];
+#endif
</ins><span class="cx"> #else
</span><span class="cx"> ASSERT_ARG(url, url);
</span><span class="cx"> m_neFilterSource = adoptNS([allocNEFilterSourceInstance() initWithURL:*url direction:NEFilterSourceDirectionInbound socketIdentifier:0]);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNEFilterSourceSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h (209146 => 209147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h 2016-11-30 20:30:16 UTC (rev 209146)
+++ trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h 2016-11-30 20:34:18 UTC (rev 209147)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> #if HAVE(MODERN_NE_FILTER_SOURCE)
</span><span class="cx">
</span><span class="cx"> #define NEFilterSourceOptionsPageData @"PageData"
</span><ins>+#define NEFilterSourceOptionsRedirectURL @"RedirectURL"
</ins><span class="cx">
</span><span class="cx"> typedef void (^NEFilterSourceDecisionHandler)(NEFilterSourceStatus, NSDictionary *);
</span><span class="cx">
</span><span class="lines">@@ -78,7 +79,9 @@
</span><span class="cx">
</span><span class="cx"> #endif // !USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><del>-// FIXME: Remove once NEFilterSourceOptionsRedirectURL is defined in the SDK.
-#ifndef NEFilterSourceOptionsRedirectURL
-#define NEFilterSourceOptionsRedirectURL @"RedirectURL"
</del><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+// FIXME: Confine this to the !USE(APPLE_INTERNAL_SDK) section once this is defined in an SDK (<rdar://problem/29147174>).
+@interface NEFilterSource (WKStaging)
+@property (copy) NSString *sourceAppBundleID;
+@end
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>