<!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>[260888] trunk/Source</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/260888">260888</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2020-04-29 02:06:59 -0700 (Wed, 29 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/260650">r260650</a>.
https://bugs.webkit.org/show_bug.cgi?id=211172

It is breaking internal bots (Requested by youenn on #webkit).

Reverted changeset:

"Call STDynamicActivityAttributionPublisher in the WebProcess"
https://bugs.webkit.org/show_bug.cgi?id=210772
https://trac.webkit.org/changeset/260650</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformHaveh">trunk/Source/WTF/wtf/PlatformHave.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitConfigurationsWebKitxcconfig">trunk/Source/WebKit/Configurations/WebKit.xcconfig</a></li>
<li><a href="#trunkSourceWebKitResourcesSandboxProfilesioscomappleWebKitWebContentsb">trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb</a></li>
<li><a href="#trunkSourceWebKitScriptsprocessentitlementssh">trunk/Source/WebKit/Scripts/process-entitlements.sh</a></li>
<li><a href="#trunkSourceWebKitSharedWebProcessCreationParameterscpp">trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKitSharedWebProcessCreationParametersh">trunk/Source/WebKit/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitWebProcessEntryPointCocoaXPCServiceWebContentServiceInfoiOSplist">trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist</a></li>
<li><a href="#trunkSourceWebKitWebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitWebProcessEntryPointCocoaXPCServiceWebContentServiceInfoPliststrings">trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/InfoPlist.strings</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WTF/ChangeLog  2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2020-04-29  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r260650.
+        https://bugs.webkit.org/show_bug.cgi?id=211172
+
+        It is breaking internal bots (Requested by youenn on #webkit).
+
+        Reverted changeset:
+
+        "Call STDynamicActivityAttributionPublisher in the WebProcess"
+        https://bugs.webkit.org/show_bug.cgi?id=210772
+        https://trac.webkit.org/changeset/260650
+
</ins><span class="cx"> 2020-04-29  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Uncaught Exception: SyntaxError: Unexpected identifier 'E'. Expected either a closing ']' or a ',' following an array element.
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformHaveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformHave.h (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformHave.h      2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -670,10 +670,6 @@
</span><span class="cx"> #define HAVE_UISCENE_BASED_VIEW_SERVICE_STATE_NOTIFICATIONS 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000
-#define HAVE_SYSTEM_STATUS_ATTRIBUTION 1
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
</span><span class="cx"> #define HAVE_IOS_JIT_RESTRICTIONS 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/ChangeLog       2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2020-04-29  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r260650.
+        https://bugs.webkit.org/show_bug.cgi?id=211172
+
+        It is breaking internal bots (Requested by youenn on #webkit).
+
+        Reverted changeset:
+
+        "Call STDynamicActivityAttributionPublisher in the WebProcess"
+        https://bugs.webkit.org/show_bug.cgi?id=210772
+        https://trac.webkit.org/changeset/260650
+
</ins><span class="cx"> 2020-04-29  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Uncaught Exception: SyntaxError: Unexpected identifier 'E'. Expected either a closing ']' or a ',' following an array element.
</span></span></pre></div>
<a id="trunkSourceWebKitConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Configurations/WebKit.xcconfig       2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig  2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -116,12 +116,6 @@
</span><span class="cx"> WK_SECURITY_INTERFACE_LDFLAGS = $(WK_SECURITY_INTERFACE_LDFLAGS_$(WK_PLATFORM_NAME));
</span><span class="cx"> WK_SECURITY_INTERFACE_LDFLAGS_macosx = -framework SecurityInterface;
</span><span class="cx"> 
</span><del>-WK_SYSTEM_STATUS_LDFLAGS = -framework SystemStatus;
-WK_SYSTEM_STATUS_LDFLAGS[sdk=iphone*13.*] = ;
-WK_SYSTEM_STATUS_LDFLAGS[sdk=macosx*] = ;
-WK_SYSTEM_STATUS_LDFLAGS[sdk=watch*] = ;
-WK_SYSTEM_STATUS_LDFLAGS[sdk=appletv*] = ;
-
</del><span class="cx"> WK_UIKIT_LDFLAGS = $(WK_UIKIT_LDFLAGS_$(WK_COCOA_TOUCH));
</span><span class="cx"> WK_UIKIT_LDFLAGS_cocoatouch = -framework UIKit;
</span><span class="cx"> 
</span><span class="lines">@@ -138,7 +132,7 @@
</span><span class="cx"> WK_AUTHKIT_LDFLAGS_macosx = $(WK_AUTHKIT_LDFLAGS$(WK_MACOS_1015));
</span><span class="cx"> WK_AUTHKIT_LDFLAGS_MACOS_SINCE_1015 = -framework AuthKit;
</span><span class="cx"> 
</span><del>-FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_SYSTEM_STATUS_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
</del><ins>+FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
</ins><span class="cx"> 
</span><span class="cx"> // Prevent C++ standard library basic_stringstream, operator new, delete and their related exception types from being exported as weak symbols.
</span><span class="cx"> UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEE
 ED1Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol -Wl,__ZTVNSt3__117bad_function_callE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEE
 NS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE;
</span></span></pre></div>
<a id="trunkSourceWebKitResourcesSandboxProfilesioscomappleWebKitWebContentsb"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb    2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -904,7 +904,6 @@
</span><span class="cx">             "com.apple.mobileassetd.v2"
</span><span class="cx">             "com.apple.nehelper"
</span><span class="cx">             "com.apple.nesessionmanager.content-filter"
</span><del>-            "com.apple.systemstatus.activityattribution"
</del><span class="cx">             "com.apple.tccd"
</span><span class="cx">             "com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI"
</span><span class="cx">             "com.apple.webinspector"
</span></span></pre></div>
<a id="trunkSourceWebKitScriptsprocessentitlementssh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Scripts/process-entitlements.sh (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Scripts/process-entitlements.sh      2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/Scripts/process-entitlements.sh 2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -144,7 +144,6 @@
</span><span class="cx">     plistbuddy Add :com.apple.private.webinspector.allow-remote-inspection bool YES
</span><span class="cx">     plistbuddy Add :com.apple.private.webinspector.proxy-application bool YES
</span><span class="cx">     plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES
</span><del>-    plistbuddy Add :com.apple.systemstatus.activityattribution bool YES
</del><span class="cx">     plistbuddy Add :dynamic-codesigning bool YES
</span><span class="cx"> 
</span><span class="cx">     plistbuddy Add :com.apple.tcc.delegated-services array
</span><span class="lines">@@ -151,9 +150,6 @@
</span><span class="cx">     plistbuddy Add :com.apple.tcc.delegated-services:0 string kTCCServiceCamera
</span><span class="cx">     plistbuddy Add :com.apple.tcc.delegated-services:1 string kTCCServiceMicrophone
</span><span class="cx"> 
</span><del>-    plistbuddy Add :com.apple.security.exception.mach-lookup.global-name array
-    plistbuddy Add :com.apple.security.exception.mach-lookup.global-name:0 string com.apple.systemstatus.activityattribution
-
</del><span class="cx">     plistbuddy Add :seatbelt-profiles array
</span><span class="cx">     plistbuddy Add :seatbelt-profiles:0 string com.apple.WebKit.WebContent
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitSharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp      2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -165,11 +165,6 @@
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx">     encoder << diagnosticsExtensionHandle;
</span><span class="cx">     encoder << runningboardExtensionHandle;
</span><del>-#endif
-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
-    encoder << systemStatusActivityAttributionExtensionHandle;
-#endif
-#if PLATFORM(IOS_FAMILY)
</del><span class="cx">     encoder << dynamicMachExtensionHandles;
</span><span class="cx">     encoder << dynamicIOKitExtensionHandles;
</span><span class="cx"> #endif
</span><span class="lines">@@ -458,14 +453,6 @@
</span><span class="cx">         return false;
</span><span class="cx">     parameters.runningboardExtensionHandle = WTFMove(*runningboardExtensionHandle);
</span><span class="cx"> 
</span><del>-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
-    Optional<Optional<SandboxExtension::Handle>> systemStatusActivityAttributionExtensionHandle;
-    decoder >> systemStatusActivityAttributionExtensionHandle;
-    if (!systemStatusActivityAttributionExtensionHandle)
-        return false;
-    parameters.systemStatusActivityAttributionExtensionHandle = WTFMove(*systemStatusActivityAttributionExtensionHandle);
-#endif
-
</del><span class="cx">     Optional<SandboxExtension::HandleArray> dynamicMachExtensionHandles;
</span><span class="cx">     decoder >> dynamicMachExtensionHandles;
</span><span class="cx">     if (!dynamicMachExtensionHandles)
</span></span></pre></div>
<a id="trunkSourceWebKitSharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h        2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h   2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -208,9 +208,6 @@
</span><span class="cx">     SandboxExtension::HandleArray dynamicMachExtensionHandles;
</span><span class="cx">     SandboxExtension::HandleArray dynamicIOKitExtensionHandles;
</span><span class="cx"> #endif
</span><del>-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
-    Optional<SandboxExtension::Handle> systemStatusActivityAttributionExtensionHandle;
-#endif
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     Optional<SandboxExtension::Handle> neHelperExtensionHandle;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm       2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm  2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -375,12 +375,6 @@
</span><span class="cx">     if (SandboxExtension::createHandleForMachLookup("com.apple.runningboard", WTF::nullopt, runningboardExtensionHandle, SandboxExtension::Flags::NoReport))
</span><span class="cx">         parameters.runningboardExtensionHandle = WTFMove(runningboardExtensionHandle);
</span><span class="cx"> 
</span><del>-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
-    SandboxExtension::Handle systemStatusActivityAttributionExtensionHandle;
-    if (SandboxExtension::createHandleForMachLookup("com.apple.systemstatus.activityattribution", WTF::nullopt, systemStatusActivityAttributionExtensionHandle, SandboxExtension::Flags::NoReport))
-        parameters.systemStatusActivityAttributionExtensionHandle = WTFMove(systemStatusActivityAttributionExtensionHandle);
-#endif
-
</del><span class="cx">     if (WebCore::deviceHasAGXCompilerService()) {
</span><span class="cx">         static const char* const ioKitClasses[] = {
</span><span class="cx">             "AGXCommandQueue",
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj     2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -1774,7 +1774,6 @@
</span><span class="cx">          CEC8F9CB1FDF5870002635E7 /* WKWebProcessPlugInNodeHandlePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC8F9CA1FDF5870002635E7 /* WKWebProcessPlugInNodeHandlePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */; };
</span><span class="cx">          CEE4AE2B1A5DCF430002F49B /* UIKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEE4AE2A1A5DCF430002F49B /* UIKitSPI.h */; };
</span><del>-               CFCFD5EB244E6BB80054543C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = CFCFD5EA244E6BB00054543C /* InfoPlist.strings */; };
</del><span class="cx">           D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; };
</span><span class="cx">          D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; };
</span><span class="cx">          DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -5231,7 +5230,6 @@
</span><span class="cx">          CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAlternativeTextClient.h; sourceTree = "<group>"; };
</span><span class="cx">          CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebAlternativeTextClient.cpp; sourceTree = "<group>"; };
</span><span class="cx">          CEE4AE2A1A5DCF430002F49B /* UIKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIKitSPI.h; sourceTree = "<group>"; };
</span><del>-               CFCFD5EA244E6BB00054543C /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = "<group>"; };
</del><span class="cx">           D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPopupMenu.cpp; sourceTree = "<group>"; };
</span><span class="cx">          D3B9484311FF4B6500032B39 /* WebPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenu.h; sourceTree = "<group>"; };
</span><span class="cx">          D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSearchPopupMenu.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -9747,7 +9745,6 @@
</span><span class="cx">                  children = (
</span><span class="cx">                          375FB4731883415600BE34D4 /* Info-iOS.plist */,
</span><span class="cx">                          BCACC44016B24CAA00B6E092 /* Info-OSX.plist */,
</span><del>-                               CFCFD5EA244E6BB00054543C /* InfoPlist.strings */,
</del><span class="cx">                   );
</span><span class="cx">                  path = WebContentService;
</span><span class="cx">                  sourceTree = "<group>";
</span><span class="lines">@@ -12089,7 +12086,6 @@
</span><span class="cx">                  isa = PBXResourcesBuildPhase;
</span><span class="cx">                  buildActionMask = 2147483647;
</span><span class="cx">                  files = (
</span><del>-                               CFCFD5EB244E6BB80054543C /* InfoPlist.strings in Resources */,
</del><span class="cx">                           E1D26A53175964D90095BFD1 /* WebContentProcess.xib in Resources */,
</span><span class="cx">                  );
</span><span class="cx">                  runOnlyForDeploymentPostprocessing = 0;
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessEntryPointCocoaXPCServiceWebContentServiceInfoiOSplist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist      2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist 2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -43,7 +43,5 @@
</span><span class="cx">  </array>
</span><span class="cx">  <key>CanInheritApplicationStateFromOtherProcesses</key>
</span><span class="cx">  <true/>
</span><del>-       <key>_WKGenericWebsiteName</key>
-       <string>Website</string>
</del><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessEntryPointCocoaXPCServiceWebContentServiceInfoPliststrings"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/InfoPlist.strings (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/InfoPlist.strings   2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/InfoPlist.strings      2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-/*
-* Copyright (C) 2020 Apple Inc. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-* THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* Localized versions of Info.plist keys */
-
-/* Generic website attribution */
-"_WKGenericWebsiteName" = "Website";
</del></span></pre></div>
<a id="trunkSourceWebKitWebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (260887 => 260888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm  2020-04-29 08:23:06 UTC (rev 260887)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm     2020-04-29 09:06:59 UTC (rev 260888)
</span><span class="lines">@@ -93,10 +93,6 @@
</span><span class="cx"> #import <JavaScriptCore/RemoteInspector.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
-#import <SystemStatus/STDynamicActivityAttributionPublisher.h>
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <WebCore/ParentalControlsContentFilter.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -224,19 +220,7 @@
</span><span class="cx">         ASSERT_UNUSED(revoked, revoked);
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><del>-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
-    if (parameters.systemStatusActivityAttributionExtensionHandle) {
-        auto extension = SandboxExtension::create(WTFMove(*parameters.systemStatusActivityAttributionExtensionHandle));
-        bool consumed = extension->consume();
-        ASSERT_UNUSED(consumed, consumed);
</del><span class="cx"> 
</span><del>-        [STDynamicActivityAttributionPublisher setCurrentAttributionKey:@"_WKGenericWebsiteName" andApp:nil];
-
-        bool revoked = extension->revoke();
-        ASSERT_UNUSED(revoked, revoked);
-    }
-#endif
-
</del><span class="cx"> #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</span><span class="cx">     WebCore::initializeLogChannelsIfNecessary(parameters.webCoreLoggingChannels);
</span><span class="cx">     WebKit::initializeLogChannelsIfNecessary(parameters.webKitLoggingChannels);
</span></span></pre>
</div>
</div>

</body>
</html>