<!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>[198200] tags/Safari-602.1.22.0.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/198200">198200</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-03-14 22:47:22 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/198089">r198089</a>. rdar://problem/24428418</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari60212202SourceWebKit2ChangeLog">tags/Safari-602.1.22.0.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari60212202SourceWebKit2ConfigurationsDebugReleasexcconfig">tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#tagsSafari60212202SourceWebKit2ConfigurationsWebContentServicexcconfig">tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/WebContentService.xcconfig</a></li>
<li><a href="#tagsSafari60212202SourceWebKit2WebKit2xcodeprojprojectpbxproj">tags/Safari-602.1.22.0.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari60212202SourceWebKit2ConfigurationsWebContentOSXentitlements">tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/WebContent-OSX.entitlements</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari60212202SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.22.0.2/Source/WebKit2/ChangeLog (198199 => 198200)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.22.0.2/Source/WebKit2/ChangeLog 2016-03-15 05:46:15 UTC (rev 198199)
+++ tags/Safari-602.1.22.0.2/Source/WebKit2/ChangeLog 2016-03-15 05:47:22 UTC (rev 198200)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-03-14 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r198089.
+
+ 2016-03-13 Dan Bernstein <mitz@apple.com>
+
+ [Mac] Injected bundle in relocatable WebContent service can’t use XPC services from other relocatable frameworks
+ https://bugs.webkit.org/show_bug.cgi?id=155414
+ <rdar://problem/24428418>
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/DebugRelease.xcconfig:
+ Set WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT to NO, because
+ engineering builds are ad-hoc signed and therefore can’t have a private entitlement.
+
+ * Configurations/WebContent-OSX.entitlements: Added. Includes the XPC domain extension
+ entitlement.
+
+ * Configurations/WebContentService.xcconfig:
+ Set WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT to YES if not already set
+ and the framework is relocatable. Set CODE_SIGN_ENTITLEMENTS to the new entitlements file
+ if the domain extension entitlement is needed.
+
+ * WebKit2.xcodeproj/project.pbxproj: Added reference to new file.
+
</ins><span class="cx"> 2016-03-11 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r198046.
</span></span></pre></div>
<a id="tagsSafari60212202SourceWebKit2ConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/DebugRelease.xcconfig (198199 => 198200)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/DebugRelease.xcconfig 2016-03-15 05:46:15 UTC (rev 198199)
+++ tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/DebugRelease.xcconfig 2016-03-15 05:47:22 UTC (rev 198200)
</span><span class="lines">@@ -50,3 +50,5 @@
</span><span class="cx"> WK_RELOCATABLE_FRAMEWORKS = YES;
</span><span class="cx"> WK_XPC_SERVICE_SUFFIX[sdk=macosx*] = .Development;
</span><span class="cx"> WK_XPC_SERVICE_SUFFIX[sdk=*simulator*] = .Development;
</span><ins>+
+WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT = NO;
</ins></span></pre></div>
<a id="tagsSafari60212202SourceWebKit2ConfigurationsWebContentOSXentitlementsfromrev198089trunkSourceWebKit2ConfigurationsWebContentOSXentitlements"></a>
<div class="copfile"><h4>Copied: tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/WebContent-OSX.entitlements (from rev 198089, trunk/Source/WebKit2/Configurations/WebContent-OSX.entitlements) (0 => 198200)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/WebContent-OSX.entitlements (rev 0)
+++ tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/WebContent-OSX.entitlements 2016-03-15 05:47:22 UTC (rev 198200)
</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.xpc.domain-extension</key>
+ <true/>
+</dict>
+</plist>
</ins></span></pre></div>
<a id="tagsSafari60212202SourceWebKit2ConfigurationsWebContentServicexcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/WebContentService.xcconfig (198199 => 198200)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/WebContentService.xcconfig 2016-03-15 05:46:15 UTC (rev 198199)
+++ tags/Safari-602.1.22.0.2/Source/WebKit2/Configurations/WebContentService.xcconfig 2016-03-15 05:47:22 UTC (rev 198200)
</span><span class="lines">@@ -25,6 +25,9 @@
</span><span class="cx">
</span><span class="cx"> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = WebContent-iOS;
</span><span class="cx">
</span><ins>+CODE_SIGN_ENTITLEMENTS[sdk=macosx*] = $(CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT));
+CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_YES = Configurations/WebContent-OSX.entitlements;
+
</ins><span class="cx"> PRODUCT_NAME = com.apple.WebKit.WebContent$(WK_XPC_SERVICE_SUFFIX);
</span><span class="cx"> INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
</span><span class="cx"> INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
</span><span class="lines">@@ -32,3 +35,8 @@
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
</span><span class="cx"> OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
</span><ins>+
+WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_$(WK_EMPTY_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT)));
+WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_ = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_NO);
+WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_NO = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT);
+WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_YES = $(WK_RELOCATABLE_FRAMEWORKS);
</ins></span></pre></div>
<a id="tagsSafari60212202SourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.22.0.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (198199 => 198200)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.22.0.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-03-15 05:46:15 UTC (rev 198199)
+++ tags/Safari-602.1.22.0.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-03-15 05:47:22 UTC (rev 198200)
</span><span class="lines">@@ -2781,6 +2781,7 @@
</span><span class="cx"> 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKActivatedElementInfo.h; sourceTree = "<group>"; };
</span><span class="cx"> 37A64E5418F38E3C00EB30F1 /* _WKInputDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKInputDelegate.h; sourceTree = "<group>"; };
</span><span class="cx"> 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFormInputSession.h; sourceTree = "<group>"; };
</span><ins>+ 37B418EB1C9624F20031E63B /* WebContent-OSX.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "WebContent-OSX.entitlements"; sourceTree = "<group>"; };
</ins><span class="cx"> 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKErrorPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CompletionHandlerCallChecker.mm; sourceTree = "<group>"; };
</span><span class="cx"> 37BEC4DF19491486008B4286 /* CompletionHandlerCallChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompletionHandlerCallChecker.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4227,6 +4228,7 @@
</span><span class="cx"> 5183B3931379F85C00E8754E /* Shim.xcconfig */,
</span><span class="cx"> 1A4F976E100E7B6600637A18 /* Version.xcconfig */,
</span><span class="cx"> 7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */,
</span><ins>+ 37B418EB1C9624F20031E63B /* WebContent-OSX.entitlements */,
</ins><span class="cx"> BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
</span><span class="cx"> BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */,
</span><span class="cx"> A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */,
</span></span></pre>
</div>
</div>
</body>
</html>