Changeset 260888 in webkit


Ignore:
Timestamp:
Apr 29, 2020 2:06:59 AM (4 years ago)
Author:
commit-queue@webkit.org
Message:

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

Location:
trunk/Source
Files:
1 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r260887 r260888  
     12020-04-29  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r260650.
     4        https://bugs.webkit.org/show_bug.cgi?id=211172
     5
     6        It is breaking internal bots (Requested by youenn on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Call STDynamicActivityAttributionPublisher in the WebProcess"
     11        https://bugs.webkit.org/show_bug.cgi?id=210772
     12        https://trac.webkit.org/changeset/260650
     13
    1142020-04-29  Devin Rousso  <drousso@apple.com>
    215

  • trunk/Source/WTF/wtf/PlatformHave.h

    r260676 r260888  
    671671#endif
    672672
    673 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000
    674 #define HAVE_SYSTEM_STATUS_ATTRIBUTION 1
    675 #endif
    676 
    677673#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
    678674#define HAVE_IOS_JIT_RESTRICTIONS 1

  • trunk/Source/WebKit/ChangeLog

    r260887 r260888  
     12020-04-29  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r260650.
     4        https://bugs.webkit.org/show_bug.cgi?id=211172
     5
     6        It is breaking internal bots (Requested by youenn on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Call STDynamicActivityAttributionPublisher in the WebProcess"
     11        https://bugs.webkit.org/show_bug.cgi?id=210772
     12        https://trac.webkit.org/changeset/260650
     13
    1142020-04-29  Devin Rousso  <drousso@apple.com>
    215

  • trunk/Source/WebKit/Configurations/WebKit.xcconfig

    r260650 r260888  
    117117WK_SECURITY_INTERFACE_LDFLAGS_macosx = -framework SecurityInterface;
    118118
    119 WK_SYSTEM_STATUS_LDFLAGS = -framework SystemStatus;
    120 WK_SYSTEM_STATUS_LDFLAGS[sdk=iphone*13.*] = ;
    121 WK_SYSTEM_STATUS_LDFLAGS[sdk=macosx*] = ;
    122 WK_SYSTEM_STATUS_LDFLAGS[sdk=watch*] = ;
    123 WK_SYSTEM_STATUS_LDFLAGS[sdk=appletv*] = ;
    124 
    125119WK_UIKIT_LDFLAGS = $(WK_UIKIT_LDFLAGS_$(WK_COCOA_TOUCH));
    126120WK_UIKIT_LDFLAGS_cocoatouch = -framework UIKit;
    … …  
    139133WK_AUTHKIT_LDFLAGS_MACOS_SINCE_1015 = -framework AuthKit;
    140134
    141 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);
     135FRAMEWORK_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);
    142136
    143137// Prevent C++ standard library basic_stringstream, operator new, delete and their related exception types from being exported as weak symbols.

  • trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb

    r260801 r260888  
    905905            "com.apple.nehelper"
    906906            "com.apple.nesessionmanager.content-filter"
    907             "com.apple.systemstatus.activityattribution"
    908907            "com.apple.tccd"
    909908            "com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI"

  • trunk/Source/WebKit/Scripts/process-entitlements.sh

    r260650 r260888  
    145145    plistbuddy Add :com.apple.private.webinspector.proxy-application bool YES
    146146    plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES
    147     plistbuddy Add :com.apple.systemstatus.activityattribution bool YES
    148147    plistbuddy Add :dynamic-codesigning bool YES
    149148
    … …  
    151150    plistbuddy Add :com.apple.tcc.delegated-services:0 string kTCCServiceCamera
    152151    plistbuddy Add :com.apple.tcc.delegated-services:1 string kTCCServiceMicrophone
    153 
    154     plistbuddy Add :com.apple.security.exception.mach-lookup.global-name array
    155     plistbuddy Add :com.apple.security.exception.mach-lookup.global-name:0 string com.apple.systemstatus.activityattribution
    156152
    157153    plistbuddy Add :seatbelt-profiles array

  • trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

    r260840 r260888  
    166166    encoder << diagnosticsExtensionHandle;
    167167    encoder << runningboardExtensionHandle;
    168 #endif
    169 #if HAVE(SYSTEM_STATUS_ATTRIBUTION)
    170     encoder << systemStatusActivityAttributionExtensionHandle;
    171 #endif
    172 #if PLATFORM(IOS_FAMILY)
    173168    encoder << dynamicMachExtensionHandles;
    174169    encoder << dynamicIOKitExtensionHandles;
    … …  
    459454    parameters.runningboardExtensionHandle = WTFMove(*runningboardExtensionHandle);
    460455
    461 #if HAVE(SYSTEM_STATUS_ATTRIBUTION)
    462     Optional<Optional<SandboxExtension::Handle>> systemStatusActivityAttributionExtensionHandle;
    463     decoder >> systemStatusActivityAttributionExtensionHandle;
    464     if (!systemStatusActivityAttributionExtensionHandle)
    465         return false;
    466     parameters.systemStatusActivityAttributionExtensionHandle = WTFMove(*systemStatusActivityAttributionExtensionHandle);
    467 #endif
    468 
    469456    Optional<SandboxExtension::HandleArray> dynamicMachExtensionHandles;
    470457    decoder >> dynamicMachExtensionHandles;

  • trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

    r260840 r260888  
    209209    SandboxExtension::HandleArray dynamicIOKitExtensionHandles;
    210210#endif
    211 #if HAVE(SYSTEM_STATUS_ATTRIBUTION)
    212     Optional<SandboxExtension::Handle> systemStatusActivityAttributionExtensionHandle;
    213 #endif
    214211
    215212#if PLATFORM(COCOA)

  • trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r260840 r260888  
    376376        parameters.runningboardExtensionHandle = WTFMove(runningboardExtensionHandle);
    377377
    378 #if HAVE(SYSTEM_STATUS_ATTRIBUTION)
    379     SandboxExtension::Handle systemStatusActivityAttributionExtensionHandle;
    380     if (SandboxExtension::createHandleForMachLookup("com.apple.systemstatus.activityattribution", WTF::nullopt, systemStatusActivityAttributionExtensionHandle, SandboxExtension::Flags::NoReport))
    381         parameters.systemStatusActivityAttributionExtensionHandle = WTFMove(systemStatusActivityAttributionExtensionHandle);
    382 #endif
    383 
    384378    if (WebCore::deviceHasAGXCompilerService()) {
    385379        static const char* const ioKitClasses[] = {

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r260856 r260888  
    17751775                CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */; };
    17761776                CEE4AE2B1A5DCF430002F49B /* UIKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEE4AE2A1A5DCF430002F49B /* UIKitSPI.h */; };
    1777                 CFCFD5EB244E6BB80054543C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = CFCFD5EA244E6BB00054543C /* InfoPlist.strings */; };
    17781777                D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; };
    17791778                D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; };
    … …  
    52325231                CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebAlternativeTextClient.cpp; sourceTree = "<group>"; };
    52335232                CEE4AE2A1A5DCF430002F49B /* UIKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIKitSPI.h; sourceTree = "<group>"; };
    5234                 CFCFD5EA244E6BB00054543C /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = "<group>"; };
    52355233                D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPopupMenu.cpp; sourceTree = "<group>"; };
    52365234                D3B9484311FF4B6500032B39 /* WebPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenu.h; sourceTree = "<group>"; };
    … …  
    97489746                                375FB4731883415600BE34D4 /* Info-iOS.plist */,
    97499747                                BCACC44016B24CAA00B6E092 /* Info-OSX.plist */,
    9750                                 CFCFD5EA244E6BB00054543C /* InfoPlist.strings */,
    97519748                        );
    97529749                        path = WebContentService;
    … …  
    1209012087                        buildActionMask = 2147483647;
    1209112088                        files = (
    12092                                 CFCFD5EB244E6BB80054543C /* InfoPlist.strings in Resources */,
    1209312089                                E1D26A53175964D90095BFD1 /* WebContentProcess.xib in Resources */,
    1209412090                        );

  • trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist

    r260650 r260888  
    4444        <key>CanInheritApplicationStateFromOtherProcesses</key>
    4545        <true/>
    46         <key>_WKGenericWebsiteName</key>
    47         <string>Website</string>
    4846</dict>
    4947</plist>

  • trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

    r260840 r260888  
    9494#endif
    9595
    96 #if HAVE(SYSTEM_STATUS_ATTRIBUTION)
    97 #import <SystemStatus/STDynamicActivityAttributionPublisher.h>
    98 #endif
    99 
    10096#if PLATFORM(IOS)
    10197#import <WebCore/ParentalControlsContentFilter.h>
    … …  
    220216        else
    221217            RELEASE_LOG_ERROR_IF_ALLOWED(ProcessSuspension, "Unable to create a process dependency assertion on UIProcess because remoteProcessID is 0");
    222 
    223         bool revoked = extension->revoke();
    224         ASSERT_UNUSED(revoked, revoked);
    225     }
    226 #endif
    227 #if HAVE(SYSTEM_STATUS_ATTRIBUTION)
    228     if (parameters.systemStatusActivityAttributionExtensionHandle) {
    229         auto extension = SandboxExtension::create(WTFMove(*parameters.systemStatusActivityAttributionExtensionHandle));
    230         bool consumed = extension->consume();
    231         ASSERT_UNUSED(consumed, consumed);
    232 
    233         [STDynamicActivityAttributionPublisher setCurrentAttributionKey:@"_WKGenericWebsiteName" andApp:nil];
    234218
    235219        bool revoked = extension->revoke();
Note: See TracChangeset for help on using the changeset viewer.