Diff
Modified: trunk/Source/WTF/wtf/PlatformHave.h (268735 => 268736)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-10-20 16:25:43 UTC (rev 268736)
@@ -414,12 +414,6 @@
#define HAVE_CFNETWORK_ALTERNATIVE_SERVICE 1
#endif
-#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
- || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
- || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
-#define HAVE_RUNNINGBOARD_VISIBILITY_ASSERTIONS 1
-#endif
-
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
#define HAVE_CSCHECKFIXDISABLE 1
#endif
Modified: trunk/Source/WebKit/ChangeLog (268735 => 268736)
--- trunk/Source/WebKit/ChangeLog 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/ChangeLog 2020-10-20 16:25:43 UTC (rev 268736)
@@ -1,3 +1,30 @@
+2020-10-20 Chris Dumez <[email protected]>
+
+ Drop legacy code using AssertionServices
+ https://bugs.webkit.org/show_bug.cgi?id=217787
+ <rdar://problem/70160942>
+
+ Reviewed by Darin Adler.
+
+ Drop legacy code using AssertionServices as this framework is deprecated in favor of
+ RunningBoard. All our code has been ported to RunningBoard already.
+
+ * Configurations/WebKit.xcconfig:
+ * Platform/spi/ios/AssertionServicesSPI.h: Removed.
+ * Shared/Cocoa/ProcessTaskStateObserver.h: Removed.
+ * Shared/Cocoa/ProcessTaskStateObserver.mm: Removed.
+ * UIProcess/ApplicationStateTracker.mm:
+ * UIProcess/ProcessAssertion.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ * UIProcess/ios/ProcessAssertionIOS.mm:
+ (-[WKProcessAssertionBackgroundTaskManager init]):
+ (-[WKProcessAssertionBackgroundTaskManager _hasBackgroundTask]):
+ (-[WKProcessAssertionBackgroundTaskManager _updateBackgroundTask]):
+ (-[WKProcessAssertionBackgroundTaskManager assertion:didInvalidateWithError:]):
+ (-[WKProcessAssertionBackgroundTaskManager _releaseBackgroundTask]):
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+
2020-10-20 Sam Weinig <[email protected]>
Tweak WebPreferences*.yaml "exposed" key to only indicate that the key should not be changeable by the frontend
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (268735 => 268736)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-10-20 16:25:43 UTC (rev 268736)
@@ -49,17 +49,6 @@
WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
WK_APPKIT_LDFLAGS_maccatalyst = -framework AppKit;
-WK_ASSERTION_SERVICES_LDFLAGS = $(WK_ASSERTION_SERVICES_LDFLAGS_$(WK_PLATFORM_NAME));
-WK_ASSERTION_SERVICES_LDFLAGS_iphoneos = $(WK_ASSERTION_SERVICES_LDFLAGS$(WK_IOS_14));
-WK_ASSERTION_SERVICES_LDFLAGS_iphonesimulator = $(WK_ASSERTION_SERVICES_LDFLAGS$(WK_IOS_14));
-WK_ASSERTION_SERVICES_LDFLAGS_IOS_BEFORE_14 = -framework AssertionServices;
-// FIXME: It is unnecessary to link against AssertionServices with the latest SDK for the following platforms too.
-WK_ASSERTION_SERVICES_LDFLAGS_watchos = -framework AssertionServices;
-WK_ASSERTION_SERVICES_LDFLAGS_watchsimulator = -framework AssertionServices;
-WK_ASSERTION_SERVICES_LDFLAGS_appletvos = -framework AssertionServices;
-WK_ASSERTION_SERVICES_LDFLAGS_appletvsimulator = -framework AssertionServices;
-WK_ASSERTION_SERVICES_LDFLAGS_maccatalyst = -framework AssertionServices;
-
WK_BACKBOARD_SERVICES_LDFLAGS = $(WK_BACKBOARD_SERVICES_LDFLAGS_$(WK_PLATFORM_NAME));
WK_BACKBOARD_SERVICES_LDFLAGS_iphoneos = -framework BackBoardServices;
WK_BACKBOARD_SERVICES_LDFLAGS_iphonesimulator = -framework BackBoardServices;
@@ -129,7 +118,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_BACKBOARD_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_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_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_BACKBOARD_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_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;
Deleted: trunk/Source/WebKit/Platform/spi/ios/AssertionServicesSPI.h (268735 => 268736)
--- trunk/Source/WebKit/Platform/spi/ios/AssertionServicesSPI.h 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/Platform/spi/ios/AssertionServicesSPI.h 2020-10-20 16:25:43 UTC (rev 268736)
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2014 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. ``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
- * 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.
- */
-
-#import <Foundation/Foundation.h>
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <AssertionServices/BKSApplicationStateMonitor.h>
-#import <AssertionServices/BKSProcess.h>
-#import <AssertionServices/BKSProcessAssertion.h>
-
-#else
-
-enum {
- BKSApplicationStateUnknown = 0,
- BKSApplicationStateTerminated = (1 << 0),
- BKSApplicationStateBackgroundTaskSuspended = (1 << 1),
- BKSApplicationStateBackgroundRunning = (1 << 2),
- BKSApplicationStateForegroundRunning = (1 << 3),
- BKSApplicationStateProcessServer = (1 << 4),
- BKSApplicationStateForegroundRunningObscured = (1 << 5),
-};
-typedef uint32_t BKSApplicationState;
-
-extern NSString * const BKSApplicationStateMostElevatedStateForProcessIDKey;
-extern NSString * const BKSApplicationStateProcessIDKey;
-
-typedef void(^BKSApplicationStateChangedHandler)(NSDictionary *userInfo);
-
-@interface BKSApplicationStateMonitor : NSObject
-
-@property (nonatomic, copy) BKSApplicationStateChangedHandler handler;
-
-- (BKSApplicationState)mostElevatedApplicationStateForPID:(pid_t)pid;
-- (void)invalidate;
-
-@end
-
-enum {
- BKSProcessAssertionNone = 0,
- BKSProcessAssertionPreventTaskSuspend = 1 << 0,
- BKSProcessAssertionPreventTaskThrottleDown = 1 << 1,
- BKSProcessAssertionAllowIdleSleep = 1 << 2,
- BKSProcessAssertionWantsForegroundResourcePriority = 1 << 3,
- BKSProcessAssertionAllowSuspendOnSleep = 1 << 4,
-};
-typedef uint32_t BKSProcessAssertionFlags;
-
-enum {
- BKSProcessAssertionReasonMediaPlayback = 1,
- BKSProcessAssertionReasonFinishTask = 4,
- BKSProcessAssertionReasonExtension = 13,
- BKSProcessAssertionReasonFinishTaskUnbounded = 10004,
-};
-typedef uint32_t BKSProcessAssertionReason;
-
-typedef void (^BKSProcessAssertionInvalidationHandler)(void);
-typedef void (^BKSProcessAssertionAcquisitionHandler)(BOOL acquired);
-
-@interface BKSProcessAssertion : NSObject
-@end
-
-@interface BKSProcessAssertion ()
-@property (nonatomic, assign) BKSProcessAssertionFlags flags;
-- (id)initWithPID:(pid_t)pid flags:(BKSProcessAssertionFlags)flags reason:(BKSProcessAssertionReason)reason name:(NSString *)name withHandler:(BKSProcessAssertionAcquisitionHandler)handler;
-
-@property (nonatomic, readonly) BOOL valid;
-@property (nonatomic, copy) BKSProcessAssertionInvalidationHandler invalidationHandler;
-- (void)invalidate;
-@end
-
-enum {
- BKSProcessTaskStateNone,
- BKSProcessTaskStateRunning,
- BKSProcessTaskStateSuspended,
-};
-typedef uint32_t BKSProcessTaskState;
-
-@class BKSProcess;
-
-@protocol BKSProcessDelegate <NSObject>
-@optional
-- (void)process:(BKSProcess *)process taskStateDidChange:(BKSProcessTaskState)newState;
-@end
-
-@interface BKSProcess : NSObject
-@end
-
-@interface BKSProcess ()
-+ (BKSProcess *)currentProcess;
-@property (nonatomic, readwrite, weak) id <BKSProcessDelegate> delegate;
-@property (nonatomic, readonly, assign) BKSProcessTaskState taskState;
-@end
-
-#endif
Deleted: trunk/Source/WebKit/Shared/Cocoa/ProcessTaskStateObserver.h (268735 => 268736)
--- trunk/Source/WebKit/Shared/Cocoa/ProcessTaskStateObserver.h 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/Shared/Cocoa/ProcessTaskStateObserver.h 2020-10-20 16:25:43 UTC (rev 268736)
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-#pragma once
-
-#if PLATFORM(IOS_FAMILY)
-
-#include <wtf/Lock.h>
-#include <wtf/RetainPtr.h>
-#include <wtf/ThreadSafeRefCounted.h>
-
-OBJC_CLASS WKProcessTaskStateObserverDelegate;
-OBJC_CLASS BKSProcess;
-
-namespace WebKit {
-
-class ProcessTaskStateObserver : public ThreadSafeRefCounted<ProcessTaskStateObserver> {
-public:
- class Client;
-
- static Ref<ProcessTaskStateObserver> create(Client&);
- ~ProcessTaskStateObserver();
-
- enum TaskState {
- None,
- Running,
- Suspended,
- };
-
- class Client {
- public:
- virtual ~Client() = default;
- virtual void processTaskStateDidChange(TaskState) = 0;
- };
-
- void invalidate();
- TaskState taskState() const { return m_taskState; }
-
-private:
- explicit ProcessTaskStateObserver(Client&);
- void setTaskState(TaskState);
-
- Client* m_client;
- Lock m_clientLock;
- TaskState m_taskState { None };
- RetainPtr<BKSProcess> m_process;
- RetainPtr<WKProcessTaskStateObserverDelegate> m_delegate;
-};
-
-}
-
-#endif // PLATFORM(IOS_FAMILY)
Deleted: trunk/Source/WebKit/Shared/Cocoa/ProcessTaskStateObserver.mm (268735 => 268736)
--- trunk/Source/WebKit/Shared/Cocoa/ProcessTaskStateObserver.mm 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/Shared/Cocoa/ProcessTaskStateObserver.mm 2020-10-20 16:25:43 UTC (rev 268736)
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-#import "config.h"
-#import "ProcessTaskStateObserver.h"
-
-#if PLATFORM(IOS_FAMILY)
-
-#import "AssertionServicesSPI.h"
-#import "Logging.h"
-#import <wtf/Function.h>
-#import <wtf/SoftLinking.h>
-
-SOFT_LINK_PRIVATE_FRAMEWORK(AssertionServices);
-SOFT_LINK_CLASS(AssertionServices, BKSProcess);
-
-typedef void(^TaskStateChangedCallbackType)(BKSProcessTaskState);
-
-@interface WKProcessTaskStateObserverDelegate : NSObject<BKSProcessDelegate>
-@property (copy) TaskStateChangedCallbackType taskStateChangedCallback;
-@end
-
-@implementation WKProcessTaskStateObserverDelegate
-- (void)dealloc
-{
- [_taskStateChangedCallback release];
- [super dealloc];
-}
-
-- (void)process:(BKSProcess *)process taskStateDidChange:(BKSProcessTaskState)newState
-{
- RELEASE_LOG(ProcessSuspension, "%p -[WKProcessTaskStateObserverDelegate process:taskStateDidChange:], process(%p), newState(%d)", self, process, (int)newState);
-
- if (auto callback = _taskStateChangedCallback)
- callback(newState);
-}
-@end
-
-namespace WebKit {
-
-static ProcessTaskStateObserver::TaskState toProcessTaskStateObserverTaskState(BKSProcessTaskState state)
-{
- static_assert(static_cast<uint32_t>(BKSProcessTaskStateNone) == static_cast<uint32_t>(ProcessTaskStateObserver::None), "BKSProcessTaskState != ProcessTaskStateObserver::TaskState");
- static_assert(static_cast<uint32_t>(BKSProcessTaskStateRunning) == static_cast<uint32_t>(ProcessTaskStateObserver::Running), "BKSProcessTaskState != ProcessTaskStateObserver::TaskState");
- static_assert(static_cast<uint32_t>(BKSProcessTaskStateSuspended) == static_cast<uint32_t>(ProcessTaskStateObserver::Suspended), "BKSProcessTaskState != ProcessTaskStateObserver::TaskState");
- return static_cast<ProcessTaskStateObserver::TaskState>(state);
-}
-
-Ref<ProcessTaskStateObserver> ProcessTaskStateObserver::create(Client& client)
-{
- return adoptRef(*new ProcessTaskStateObserver(client));
-}
-
-ProcessTaskStateObserver::ProcessTaskStateObserver(Client& client)
- : m_client(&client)
- , m_process([getBKSProcessClass() currentProcess])
- , m_delegate(adoptNS([[WKProcessTaskStateObserverDelegate alloc] init]))
-{
- RELEASE_LOG(ProcessSuspension, "%p - ProcessTaskStateObserver::ProcessTaskStateObserver(), m_process(%p)", this, m_process.get());
- m_delegate.get().taskStateChangedCallback = [protectedThis = makeRefPtr(this)] (BKSProcessTaskState state) {
- protectedThis->setTaskState(toProcessTaskStateObserverTaskState(state));
- };
- m_process.get().delegate = m_delegate.get();
-}
-
-ProcessTaskStateObserver::~ProcessTaskStateObserver()
-{
- m_delegate.get().taskStateChangedCallback = nil;
-}
-
-void ProcessTaskStateObserver::invalidate()
-{
- LockHolder holder(m_clientLock);
- m_client = nullptr;
- m_delegate.get().taskStateChangedCallback = nil;
-}
-
-void ProcessTaskStateObserver::setTaskState(TaskState state)
-{
- if (m_taskState == state)
- return;
-
- m_taskState = state;
-
- LockHolder holder(m_clientLock);
- if (m_client)
- m_client->processTaskStateDidChange(state);
-}
-
-}
-
-#endif // PLATFORM(IOS_FAMILY)
-
Modified: trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm (268735 => 268736)
--- trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm 2020-10-20 16:25:43 UTC (rev 268736)
@@ -28,7 +28,6 @@
#if PLATFORM(IOS_FAMILY)
-#import "AssertionServicesSPI.h"
#import "EndowmentStateTracker.h"
#import "Logging.h"
#import "SandboxUtilities.h"
Modified: trunk/Source/WebKit/UIProcess/ProcessAssertion.h (268735 => 268736)
--- trunk/Source/WebKit/UIProcess/ProcessAssertion.h 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/UIProcess/ProcessAssertion.h 2020-10-20 16:25:43 UTC (rev 268736)
@@ -39,10 +39,6 @@
OBJC_CLASS RBSAssertion;
OBJC_CLASS WKRBSAssertionDelegate;
-
-#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
-OBJC_CLASS BKSProcessAssertion;
-#endif
#endif // PLATFORM(IOS_FAMILY)
namespace WebKit {
@@ -79,10 +75,7 @@
#if PLATFORM(IOS_FAMILY)
RetainPtr<RBSAssertion> m_rbsAssertion;
RetainPtr<WKRBSAssertionDelegate> m_delegate;
-#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
- RetainPtr<BKSProcessAssertion> m_bksAssertion; // Legacy.
#endif
-#endif
Function<void()> m_invalidationHandler;
};
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (268735 => 268736)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2020-10-20 16:25:43 UTC (rev 268736)
@@ -30,7 +30,6 @@
#import "APIData.h"
#import "ApplicationStateTracker.h"
-#import "AssertionServicesSPI.h"
#import "DataReference.h"
#import "DownloadProxy.h"
#import "DrawingAreaProxy.h"
Modified: trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm (268735 => 268736)
--- trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm 2020-10-20 16:25:43 UTC (rev 268736)
@@ -37,10 +37,6 @@
#import <wtf/Vector.h>
#import <wtf/WeakHashSet.h>
-#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
-#import "AssertionServicesSPI.h"
-#endif
-
using WebKit::ProcessAndUIAssertion;
// This gives some time to our child processes to process the ProcessWillSuspendImminently IPC but makes sure we release
@@ -54,11 +50,7 @@
}
@interface WKProcessAssertionBackgroundTaskManager
-#if HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
: NSObject <RBSAssertionObserving>
-#else
- : NSObject
-#endif
+ (WKProcessAssertionBackgroundTaskManager *)shared;
@@ -69,12 +61,7 @@
@implementation WKProcessAssertionBackgroundTaskManager
{
-#if HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
RetainPtr<RBSAssertion> _backgroundTask;
-#else
- UIBackgroundTaskIdentifier _backgroundTask;
-#endif
-
WeakHashSet<ProcessAndUIAssertion> _assertionsNeedingBackgroundTask;
dispatch_block_t _pendingTaskReleaseTask;
}
@@ -91,10 +78,6 @@
if (!self)
return nil;
-#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
- _backgroundTask = UIBackgroundTaskInvalid;
-#endif
-
// FIXME: Stop relying on UIApplication notifications as this does not work as expected for daemons or ViewServices.
// We should likely use ProcessTaskStateObserver to monitor suspension state.
[[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationWillEnterForegroundNotification object:[UIApplication sharedApplication] queue:nil usingBlock:^(NSNotification *) {
@@ -175,11 +158,7 @@
- (BOOL)_hasBackgroundTask
{
-#if HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
return !!_backgroundTask;
-#else
- return _backgroundTask != UIBackgroundTaskInvalid;
-#endif
}
- (void)_updateBackgroundTask
@@ -190,7 +169,6 @@
return;
}
RELEASE_LOG(ProcessSuspension, "%p - WKProcessAssertionBackgroundTaskManager: beginBackgroundTaskWithName", self);
-#if HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
RBSTarget *target = [RBSTarget currentProcess];
RBSDomainAttribute *domainAttribute = [RBSDomainAttribute attributeWithDomain:@"com.apple.common" name:@"FinishTaskInterruptable"];
_backgroundTask = adoptNS([[RBSAssertion alloc] initWithExplanation:@"WebKit UIProcess background task" target:target attributes:@[domainAttribute]]);
@@ -201,16 +179,10 @@
RELEASE_LOG_ERROR(ProcessSuspension, "WKProcessAssertionBackgroundTaskManager: Failed to acquire FinishTaskInterruptable assertion for own process, error: %{public}@", acquisitionError);
else
RELEASE_LOG(ProcessSuspension, "WKProcessAssertionBackgroundTaskManager: Successfully took a FinishTaskInterruptable assertion for own process");
-#else
- _backgroundTask = [[UIApplication sharedApplication] beginBackgroundTaskWithName:@"com.apple.WebKit.ProcessAssertion" expirationHandler:^{
- [self _handleBackgroundTaskExpiration];
- }];
-#endif
} else if (_assertionsNeedingBackgroundTask.computesEmpty())
[self _releaseBackgroundTask];
}
-#if HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
- (void)assertionWillInvalidate:(RBSAssertion *)assertion
{
ASSERT(assertion == _backgroundTask.get());
@@ -222,7 +194,6 @@
ASSERT(assertion == _backgroundTask.get());
RELEASE_LOG_ERROR(ProcessSuspension, "WKProcessAssertionBackgroundTaskManager: FinishTaskInterruptable assertion was invalidated, error: %{public}@", error);
}
-#endif
- (void)_handleBackgroundTaskExpiration
{
@@ -265,14 +236,9 @@
if (processHasActiveRunTimeLimitation())
WebKit::WebProcessPool::notifyProcessPoolsApplicationIsAboutToSuspend();
-#if HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
[_backgroundTask removeObserver:self];
[_backgroundTask invalidate];
_backgroundTask = nullptr;
-#else
- [[UIApplication sharedApplication] endBackgroundTask:_backgroundTask];
- _backgroundTask = UIBackgroundTaskInvalid;
-#endif
}
@end
@@ -312,7 +278,6 @@
static NSString *runningBoardNameForAssertionType(ProcessAssertionType assertionType)
{
-#if HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
switch (assertionType) {
case ProcessAssertionType::Suspended:
return @"Suspended";
@@ -325,47 +290,8 @@
case ProcessAssertionType::MediaPlayback:
return @"MediaPlayback";
}
-#else
- return nil;
-#endif
}
-#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
-
-const BKSProcessAssertionFlags suspendedTabFlags = (BKSProcessAssertionAllowIdleSleep);
-const BKSProcessAssertionFlags backgroundTabFlags = (BKSProcessAssertionPreventTaskSuspend);
-const BKSProcessAssertionFlags foregroundTabFlags = (BKSProcessAssertionPreventTaskSuspend | BKSProcessAssertionWantsForegroundResourcePriority | BKSProcessAssertionPreventTaskThrottleDown);
-
-static BKSProcessAssertionFlags flagsForAssertionType(ProcessAssertionType assertionType)
-{
- switch (assertionType) {
- case ProcessAssertionType::Suspended:
- return suspendedTabFlags;
- case ProcessAssertionType::Background:
- case ProcessAssertionType::UnboundedNetworking:
- return backgroundTabFlags;
- case ProcessAssertionType::Foreground:
- case ProcessAssertionType::MediaPlayback:
- return foregroundTabFlags;
- }
-}
-
-static BKSProcessAssertionReason toBKSProcessAssertionReason(ProcessAssertionType assertionType)
-{
- switch (assertionType) {
- case ProcessAssertionType::Suspended:
- case ProcessAssertionType::Background:
- case ProcessAssertionType::Foreground:
- return BKSProcessAssertionReasonExtension;
- case ProcessAssertionType::UnboundedNetworking:
- return BKSProcessAssertionReasonFinishTaskUnbounded;
- case ProcessAssertionType::MediaPlayback:
- return BKSProcessAssertionReasonMediaPlayback;
- }
-}
-
-#endif // !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
-
ProcessAssertion::ProcessAssertion(pid_t pid, const String& reason, ProcessAssertionType assertionType)
: m_assertionType(assertionType)
, m_pid(pid)
@@ -372,34 +298,6 @@
{
auto weakThis = makeWeakPtr(*this);
NSString *runningBoardAssertionName = runningBoardNameForAssertionType(assertionType);
-
-#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
- if (!runningBoardAssertionName) {
- // Legacy code path.
- BKSProcessAssertionAcquisitionHandler handler = ^(BOOL acquired) {
- if (!acquired) {
- RELEASE_LOG_ERROR(ProcessSuspension, " %p - ProcessAssertion() PID %d Unable to acquire BKS assertion for process with PID %d", this, getpid(), pid);
- dispatch_async(dispatch_get_main_queue(), ^{
- if (weakThis)
- processAssertionWasInvalidated();
- });
- }
- };
- RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion() PID %d acquiring BKS assertion for process with PID %d, name '%s'", this, getpid(), pid, reason.utf8().data());
-
- m_bksAssertion = adoptNS([[BKSProcessAssertion alloc] initWithPID:pid flags:flagsForAssertionType(assertionType) reason:toBKSProcessAssertionReason(assertionType) name:reason withHandler:handler]);
-
- m_bksAssertion.get().invalidationHandler = ^() {
- dispatch_async(dispatch_get_main_queue(), ^{
- RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion() BKS Process assertion for process with PID %d was invalidated", this, pid);
- if (weakThis)
- processAssertionWasInvalidated();
- });
- };
- return;
- }
-#endif // !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
-
ASSERT(runningBoardAssertionName);
if (!pid) {
RELEASE_LOG_ERROR(ProcessSuspension, "%p - ProcessAssertion: Failed to acquire RBS %{public}@ assertion '%{public}s' for process because PID is invalid", this, runningBoardAssertionName, reason.utf8().data());
@@ -438,13 +336,6 @@
m_delegate = nil;
[m_rbsAssertion invalidate];
}
-
-#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
- if (m_bksAssertion) {
- m_bksAssertion.get().invalidationHandler = nil;
- [m_bksAssertion invalidate];
- }
-#endif
}
void ProcessAssertion::processAssertionWasInvalidated()
@@ -458,15 +349,7 @@
bool ProcessAssertion::isValid() const
{
- if (m_rbsAssertion)
- return m_rbsAssertion.get().valid;
-
-#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
- if (m_bksAssertion)
- return m_bksAssertion.get().valid;
-#endif
-
- return false;
+ return m_rbsAssertion && m_rbsAssertion.get().valid;
}
void ProcessAndUIAssertion::updateRunInBackgroundCount()
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (268735 => 268736)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-10-20 16:25:43 UTC (rev 268736)
@@ -1738,8 +1738,6 @@
CD0C6831201FD10100A59409 /* WKFullScreenViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = CD0C682F201FD10100A59409 /* WKFullScreenViewController.h */; };
CD19A26E1A13E834008D650E /* WebDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD19A26A1A13E821008D650E /* WebDiagnosticLoggingClient.h */; };
CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */ = {isa = PBXBuildFile; fileRef = CD19D2E82046406F0017074A /* FullscreenTouchSecheuristic.h */; settings = {ATTRIBUTES = (Private, ); }; };
- CD2865EE2255562000606AC7 /* ProcessTaskStateObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = CD2865EC2255562000606AC7 /* ProcessTaskStateObserver.h */; };
- CD2865EF2255562000606AC7 /* ProcessTaskStateObserver.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD2865ED2255562000606AC7 /* ProcessTaskStateObserver.mm */; };
CD4570D3244113B500A3DCEB /* AudioSessionRoutingArbitratorProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD4570D02441014A00A3DCEB /* AudioSessionRoutingArbitratorProxyMessageReceiver.cpp */; };
CD4570D424411D0F00A3DCEB /* AudioSessionRoutingArbitrator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD4570CB2440FB2A00A3DCEB /* AudioSessionRoutingArbitrator.cpp */; };
CD46618324010A670047CA35 /* RemoteCDMInstanceSessionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD466181240105640047CA35 /* RemoteCDMInstanceSessionMessageReceiver.cpp */; };
@@ -1789,7 +1787,6 @@
CDE555342406EB8C008A3DDB /* RemoteLegacyCDMSessionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE5552E2406B897008A3DDB /* RemoteLegacyCDMSessionMessageReceiver.cpp */; };
CDE555352406EB8C008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE555312406B897008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp */; };
CE11AD521CBC482F00681EE5 /* CodeSigning.h in Headers */ = {isa = PBXBuildFile; fileRef = CE11AD511CBC482F00681EE5 /* CodeSigning.h */; };
- CE1A0BD21A48E6C60054EF74 /* AssertionServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BCC1A48E6C60054EF74 /* AssertionServicesSPI.h */; };
CE1A0BD61A48E6C60054EF74 /* TCCSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BD01A48E6C60054EF74 /* TCCSPI.h */; };
CE1A0BD71A48E6C60054EF74 /* TextInputSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BD11A48E6C60054EF74 /* TextInputSPI.h */; };
CE21215F240EE571006ED443 /* WKTextPlaceholder.h in Headers */ = {isa = PBXBuildFile; fileRef = CE21215D240EE571006ED443 /* WKTextPlaceholder.h */; };
@@ -5149,8 +5146,6 @@
CD19A26A1A13E821008D650E /* WebDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDiagnosticLoggingClient.h; sourceTree = "<group>"; };
CD19D2E82046406F0017074A /* FullscreenTouchSecheuristic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FullscreenTouchSecheuristic.h; path = ios/fullscreen/FullscreenTouchSecheuristic.h; sourceTree = "<group>"; };
CD19D2E92046406F0017074A /* FullscreenTouchSecheuristic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = FullscreenTouchSecheuristic.cpp; path = ios/fullscreen/FullscreenTouchSecheuristic.cpp; sourceTree = "<group>"; };
- CD2865EC2255562000606AC7 /* ProcessTaskStateObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ProcessTaskStateObserver.h; sourceTree = "<group>"; };
- CD2865ED2255562000606AC7 /* ProcessTaskStateObserver.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ProcessTaskStateObserver.mm; sourceTree = "<group>"; };
CD4570CA2440FB2A00A3DCEB /* AudioSessionRoutingArbitrator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AudioSessionRoutingArbitrator.h; sourceTree = "<group>"; };
CD4570CB2440FB2A00A3DCEB /* AudioSessionRoutingArbitrator.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AudioSessionRoutingArbitrator.cpp; sourceTree = "<group>"; };
CD4570D02441014A00A3DCEB /* AudioSessionRoutingArbitratorProxyMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AudioSessionRoutingArbitratorProxyMessageReceiver.cpp; sourceTree = "<group>"; };
@@ -5305,7 +5300,6 @@
CDE555312406B897008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteLegacyCDMSessionProxyMessageReceiver.cpp; sourceTree = "<group>"; };
CE11AD4F1CBC47F800681EE5 /* CodeSigning.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CodeSigning.mm; sourceTree = "<group>"; };
CE11AD511CBC482F00681EE5 /* CodeSigning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeSigning.h; sourceTree = "<group>"; };
- CE1A0BCC1A48E6C60054EF74 /* AssertionServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssertionServicesSPI.h; sourceTree = "<group>"; };
CE1A0BD01A48E6C60054EF74 /* TCCSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TCCSPI.h; sourceTree = "<group>"; };
CE1A0BD11A48E6C60054EF74 /* TextInputSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextInputSPI.h; sourceTree = "<group>"; };
CE21215D240EE571006ED443 /* WKTextPlaceholder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKTextPlaceholder.h; path = ios/WKTextPlaceholder.h; sourceTree = "<group>"; };
@@ -7583,8 +7577,6 @@
CE550E12228373C800D28791 /* InsertTextOptions.h */,
C1663E5A24AEA74200C6A3B2 /* LaunchServicesDatabaseXPCConstants.h */,
2D1087621D2C641B00B85F82 /* LoadParametersCocoa.mm */,
- CD2865EC2255562000606AC7 /* ProcessTaskStateObserver.h */,
- CD2865ED2255562000606AC7 /* ProcessTaskStateObserver.mm */,
7AB4EA3F22777C460085BBAA /* SandboxExtensionCocoa.mm */,
7AB4EA4122777FC70085BBAA /* SandboxInitialiationParametersCocoa.mm */,
E19BDA88193686A400B97F57 /* SandboxUtilities.h */,
@@ -10570,7 +10562,6 @@
CE1A0BCB1A48E6C60054EF74 /* ios */ = {
isa = PBXGroup;
children = (
- CE1A0BCC1A48E6C60054EF74 /* AssertionServicesSPI.h */,
CDA041F31ACE2105004A13EC /* BackBoardServicesSPI.h */,
95C943902523C0D00054F3D5 /* BaseBoardSPI.h */,
2D4AF0882044C3C4006C8817 /* FrontBoardServicesSPI.h */,
@@ -10918,7 +10909,6 @@
1AEFD2F711D1807B008219D3 /* ArgumentCoders.h in Headers */,
1AAF0C4A12B16334008E49E2 /* ArgumentCodersCF.h in Headers */,
A175C44A21AA3171000037D0 /* ArgumentCodersCocoa.h in Headers */,
- CE1A0BD21A48E6C60054EF74 /* AssertionServicesSPI.h in Headers */,
515E7728183DD6F60007203F /* AsyncRequest.h in Headers */,
AAFA634F234F7C6400FFA864 /* AsyncRevalidation.h in Headers */,
BCEE966D112FAF57006BCC24 /* Attachment.h in Headers */,
@@ -11229,7 +11219,6 @@
E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */,
86F9536518FF58F5001DB2EF /* ProcessAssertion.h in Headers */,
BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */,
- CD2865EE2255562000606AC7 /* ProcessTaskStateObserver.h in Headers */,
463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */,
86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */,
83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */,
@@ -13060,7 +13049,6 @@
2D91344D212CF9F000128AFD /* PluginView.cpp in Sources */,
C15CBB3723F37ECB00300CC7 /* PreferenceObserver.mm in Sources */,
2D54C31B212F4DA60049C174 /* ProcessLauncher.cpp in Sources */,
- CD2865EF2255562000606AC7 /* ProcessTaskStateObserver.mm in Sources */,
1A0C227F2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm in Sources */,
1A0C225E243575CD00ED614D /* QuickLookThumbnailLoader.mm in Sources */,
9B1229CE23FF25F2008CA751 /* RemoteAudioDestinationManager.cpp in Sources */,
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (268735 => 268736)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-10-20 16:20:16 UTC (rev 268735)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-10-20 16:25:43 UTC (rev 268736)
@@ -102,7 +102,6 @@
#if PLATFORM(IOS_FAMILY)
#import "AccessibilitySupportSPI.h"
-#import "AssertionServicesSPI.h"
#import "RunningBoardServicesSPI.h"
#import "UserInterfaceIdiom.h"
#import "WKAccessibilityWebPageObjectIOS.h"
