Diff
Modified: branches/safari-610.1.11-branch/Source/WTF/ChangeLog (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WTF/ChangeLog 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WTF/ChangeLog 2020-05-01 16:30:29 UTC (rev 261003)
@@ -1,3 +1,33 @@
+2020-05-01 Alan Coon <[email protected]>
+
+ Cherry-pick r260888. rdar://problem/62714948
+
+ 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
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-29 Commit Queue <[email protected]>
+
+ 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
+
2020-04-29 Alan Coon <[email protected]>
Cherry-pick r260650. rdar://problem/62622460
Modified: branches/safari-610.1.11-branch/Source/WTF/wtf/PlatformHave.h (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WTF/wtf/PlatformHave.h 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WTF/wtf/PlatformHave.h 2020-05-01 16:30:29 UTC (rev 261003)
@@ -666,10 +666,6 @@
#define HAVE_UISCENE_BASED_VIEW_SERVICE_STATE_NOTIFICATIONS 1
#endif
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000
-#define HAVE_SYSTEM_STATUS_ATTRIBUTION 1
-#endif
-
#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
#define HAVE_IOS_JIT_RESTRICTIONS 1
#endif
Modified: branches/safari-610.1.11-branch/Source/WebKit/ChangeLog (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/ChangeLog 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/ChangeLog 2020-05-01 16:30:29 UTC (rev 261003)
@@ -1,3 +1,33 @@
+2020-05-01 Alan Coon <[email protected]>
+
+ Cherry-pick r260888. rdar://problem/62714948
+
+ 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
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-29 Commit Queue <[email protected]>
+
+ 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
+
2020-04-29 Alan Coon <[email protected]>
Cherry-pick r260920. rdar://problem/62627737
Modified: branches/safari-610.1.11-branch/Source/WebKit/Configurations/WebKit.xcconfig (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/Configurations/WebKit.xcconfig 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/Configurations/WebKit.xcconfig 2020-05-01 16:30:29 UTC (rev 261003)
@@ -108,12 +108,6 @@
WK_SECURITY_INTERFACE_LDFLAGS = $(WK_SECURITY_INTERFACE_LDFLAGS_$(WK_PLATFORM_NAME));
WK_SECURITY_INTERFACE_LDFLAGS_macosx = -framework SecurityInterface;
-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*] = ;
-
WK_UIKIT_LDFLAGS = $(WK_UIKIT_LDFLAGS_$(WK_COCOA_TOUCH));
WK_UIKIT_LDFLAGS_cocoatouch = -framework UIKit;
@@ -130,7 +124,7 @@
WK_AUTHKIT_LDFLAGS_macosx = $(WK_AUTHKIT_LDFLAGS$(WK_MACOS_1015));
WK_AUTHKIT_LDFLAGS_MACOS_SINCE_1015 = -framework AuthKit;
-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);
+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);
// Prevent C++ standard library basic_stringstream, operator new, delete and their related exception types from being exported as weak symbols.
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;
Modified: branches/safari-610.1.11-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-05-01 16:30:29 UTC (rev 261003)
@@ -902,7 +902,6 @@
"com.apple.mobileassetd.v2"
"com.apple.nehelper"
"com.apple.nesessionmanager.content-filter"
- "com.apple.systemstatus.activityattribution"
"com.apple.tccd"
"com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI"
"com.apple.webinspector"
Modified: branches/safari-610.1.11-branch/Source/WebKit/Scripts/process-entitlements.sh (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/Scripts/process-entitlements.sh 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/Scripts/process-entitlements.sh 2020-05-01 16:30:29 UTC (rev 261003)
@@ -144,7 +144,6 @@
plistbuddy Add :com.apple.private.webinspector.allow-remote-inspection bool YES
plistbuddy Add :com.apple.private.webinspector.proxy-application bool YES
plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES
- plistbuddy Add :com.apple.systemstatus.activityattribution bool YES
plistbuddy Add :dynamic-codesigning bool YES
plistbuddy Add :com.apple.tcc.delegated-services array
@@ -151,9 +150,6 @@
plistbuddy Add :com.apple.tcc.delegated-services:0 string kTCCServiceCamera
plistbuddy Add :com.apple.tcc.delegated-services:1 string kTCCServiceMicrophone
- 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
-
plistbuddy Add :seatbelt-profiles array
plistbuddy Add :seatbelt-profiles:0 string com.apple.WebKit.WebContent
}
Modified: branches/safari-610.1.11-branch/Source/WebKit/Shared/WebProcessCreationParameters.cpp (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-05-01 16:30:29 UTC (rev 261003)
@@ -165,11 +165,6 @@
#if PLATFORM(IOS_FAMILY)
encoder << diagnosticsExtensionHandle;
encoder << runningboardExtensionHandle;
-#endif
-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
- encoder << systemStatusActivityAttributionExtensionHandle;
-#endif
-#if PLATFORM(IOS_FAMILY)
encoder << dynamicMachExtensionHandles;
encoder << dynamicIOKitExtensionHandles;
#endif
@@ -458,14 +453,6 @@
return false;
parameters.runningboardExtensionHandle = WTFMove(*runningboardExtensionHandle);
-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
- Optional<Optional<SandboxExtension::Handle>> systemStatusActivityAttributionExtensionHandle;
- decoder >> systemStatusActivityAttributionExtensionHandle;
- if (!systemStatusActivityAttributionExtensionHandle)
- return false;
- parameters.systemStatusActivityAttributionExtensionHandle = WTFMove(*systemStatusActivityAttributionExtensionHandle);
-#endif
-
Optional<SandboxExtension::HandleArray> dynamicMachExtensionHandles;
decoder >> dynamicMachExtensionHandles;
if (!dynamicMachExtensionHandles)
Modified: branches/safari-610.1.11-branch/Source/WebKit/Shared/WebProcessCreationParameters.h (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/Shared/WebProcessCreationParameters.h 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/Shared/WebProcessCreationParameters.h 2020-05-01 16:30:29 UTC (rev 261003)
@@ -208,9 +208,6 @@
SandboxExtension::HandleArray dynamicMachExtensionHandles;
SandboxExtension::HandleArray dynamicIOKitExtensionHandles;
#endif
-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
- Optional<SandboxExtension::Handle> systemStatusActivityAttributionExtensionHandle;
-#endif
#if PLATFORM(COCOA)
Optional<SandboxExtension::Handle> neHelperExtensionHandle;
Modified: branches/safari-610.1.11-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-05-01 16:30:29 UTC (rev 261003)
@@ -374,12 +374,6 @@
if (SandboxExtension::createHandleForMachLookup("com.apple.runningboard", WTF::nullopt, runningboardExtensionHandle, SandboxExtension::Flags::NoReport))
parameters.runningboardExtensionHandle = WTFMove(runningboardExtensionHandle);
-#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
-
if (WebCore::deviceHasAGXCompilerService()) {
static const char* const ioKitClasses[] = {
"AGXCommandQueue",
Modified: branches/safari-610.1.11-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-05-01 16:30:29 UTC (rev 261003)
@@ -1769,7 +1769,6 @@
CEC8F9CB1FDF5870002635E7 /* WKWebProcessPlugInNodeHandlePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC8F9CA1FDF5870002635E7 /* WKWebProcessPlugInNodeHandlePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */; };
CEE4AE2B1A5DCF430002F49B /* UIKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEE4AE2A1A5DCF430002F49B /* UIKitSPI.h */; };
- CFCFD5EB244E6BB80054543C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = CFCFD5EA244E6BB00054543C /* InfoPlist.strings */; };
D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; };
D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; };
DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -5219,7 +5218,6 @@
CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAlternativeTextClient.h; sourceTree = "<group>"; };
CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebAlternativeTextClient.cpp; sourceTree = "<group>"; };
CEE4AE2A1A5DCF430002F49B /* UIKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIKitSPI.h; sourceTree = "<group>"; };
- CFCFD5EA244E6BB00054543C /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = "<group>"; };
D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPopupMenu.cpp; sourceTree = "<group>"; };
D3B9484311FF4B6500032B39 /* WebPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenu.h; sourceTree = "<group>"; };
D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSearchPopupMenu.cpp; sourceTree = "<group>"; };
@@ -9739,7 +9737,6 @@
children = (
375FB4731883415600BE34D4 /* Info-iOS.plist */,
BCACC44016B24CAA00B6E092 /* Info-OSX.plist */,
- CFCFD5EA244E6BB00054543C /* InfoPlist.strings */,
);
path = WebContentService;
sourceTree = "<group>";
@@ -12078,7 +12075,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- CFCFD5EB244E6BB80054543C /* InfoPlist.strings in Resources */,
E1D26A53175964D90095BFD1 /* WebContentProcess.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Modified: branches/safari-610.1.11-branch/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist 2020-05-01 16:30:29 UTC (rev 261003)
@@ -45,7 +45,5 @@
</array>
<key>CanInheritApplicationStateFromOtherProcesses</key>
<true/>
- <key>_WKGenericWebsiteName</key>
- <string>Website</string>
</dict>
</plist>
Deleted: branches/safari-610.1.11-branch/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/InfoPlist.strings (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/InfoPlist.strings 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/InfoPlist.strings 2020-05-01 16:30:29 UTC (rev 261003)
@@ -1,29 +0,0 @@
-/*
-* 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";
Modified: branches/safari-610.1.11-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (261002 => 261003)
--- branches/safari-610.1.11-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-05-01 16:18:28 UTC (rev 261002)
+++ branches/safari-610.1.11-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-05-01 16:30:29 UTC (rev 261003)
@@ -94,10 +94,6 @@
#import <_javascript_Core/RemoteInspector.h>
#endif
-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
-#import <SystemStatus/STDynamicActivityAttributionPublisher.h>
-#endif
-
#if PLATFORM(IOS)
#import <WebCore/ParentalControlsContentFilter.h>
#endif
@@ -197,19 +193,7 @@
ASSERT_UNUSED(revoked, revoked);
}
#endif
-#if HAVE(SYSTEM_STATUS_ATTRIBUTION)
- if (parameters.systemStatusActivityAttributionExtensionHandle) {
- auto extension = SandboxExtension::create(WTFMove(*parameters.systemStatusActivityAttributionExtensionHandle));
- bool consumed = extension->consume();
- ASSERT_UNUSED(consumed, consumed);
- [STDynamicActivityAttributionPublisher setCurrentAttributionKey:@"_WKGenericWebsiteName" andApp:nil];
-
- bool revoked = extension->revoke();
- ASSERT_UNUSED(revoked, revoked);
- }
-#endif
-
#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
WebCore::initializeLogChannelsIfNecessary(parameters.webCoreLoggingChannels);
WebKit::initializeLogChannelsIfNecessary(parameters.webKitLoggingChannels);
