Changeset 260574 in webkit

Timestamp:

Apr 23, 2020 9:27:03 AM (4 years ago)

Author:

Chris Dumez

Message:

[iOS] Port MediaPlayback process assertion to RunningBoard
​https://bugs.webkit.org/show_bug.cgi?id=210212
<rdar://problem/61476951>

Reviewed by Geoff Garen.

Port MediaPlayback process assertion to RunningBoard instead of the legacy BKSProcessAssertion.
We can now #ifdef out the legacy BKSProcessAssertion on recent iOS builds.

• UIProcess/ProcessAssertion.h:
• UIProcess/ios/ProcessAssertionIOS.mm:

(WebKit::runningBoardNameForAssertionType):
(WebKit::ProcessAssertion::ProcessAssertion):
(WebKit::ProcessAssertion::~ProcessAssertion):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ProcessAssertion.h (modified) (2 diffs)
• UIProcess/ios/ProcessAssertionIOS.mm (modified) (8 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-23  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Port MediaPlayback process assertion to RunningBoard
+        https://bugs.webkit.org/show_bug.cgi?id=210212
+        <rdar://problem/61476951>
+
+        Reviewed by Geoff Garen.
+
+        Port MediaPlayback process assertion to RunningBoard instead of the legacy BKSProcessAssertion.
+        We can now #ifdef out the legacy BKSProcessAssertion on recent iOS builds.
+
+        * UIProcess/ProcessAssertion.h:
+        * UIProcess/ios/ProcessAssertionIOS.mm:
+        (WebKit::runningBoardNameForAssertionType):
+        (WebKit::ProcessAssertion::ProcessAssertion):
+        (WebKit::ProcessAssertion::~ProcessAssertion):
+
 2020-04-23  John Frankish  <john.frankish@outlook.com>
 

trunk/Source/WebKit/UIProcess/ProcessAssertion.h

@@ -40 +40 @@
 OBJC_CLASS RBSAssertion;
 OBJC_CLASS WKRBSAssertionDelegate;
+#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
 OBJC_CLASS BKSProcessAssertion;
+#endif
 #endif // PLATFORM(IOS_FAMILY)
 
@@ -86 +88 @@
     RetainPtr<RBSAssertion> m_rbsAssertion;
     RetainPtr<WKRBSAssertionDelegate> m_delegate;
+#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
     RetainPtr<BKSProcessAssertion> m_bksAssertion; // Legacy.
+#endif
     Validity m_validity { Validity::Unset };
 #endif

trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm

@@ -29 +29 @@
 #if PLATFORM(IOS_FAMILY)
 
-#import "AssertionServicesSPI.h"
 #import "Logging.h"
 #import "RunningBoardServicesSPI.h"
@@ -38 +37 @@
 #import <wtf/Vector.h>
 #import <wtf/WeakHashSet.h>
+
+#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
+#import "AssertionServicesSPI.h"
+#endif
 
 using WebKit::ProcessAndUIAssertion;
@@ -314 +317 @@
         return @"DependentProcessLink";
     case ProcessAssertionType::MediaPlayback:
-        return nil; // FIXME: Name to be defined in <rdar://problem/61263147>.
+        return @"MediaPlayback";
     }
 #else
@@ -322 +325 @@
 #endif
 }
+
+#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
 
 const BKSProcessAssertionFlags suspendedTabFlags = (BKSProcessAssertionAllowIdleSleep);
@@ -361 +366 @@
 }
 
+#endif // !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
+
 ProcessAssertion::ProcessAssertion(pid_t pid, const String& reason, ProcessAssertionType assertionType)
     : m_assertionType(assertionType)
@@ -367 +374 @@
     auto weakThis = makeWeakPtr(*this);
     NSString *runningBoardAssertionName = runningBoardNameForAssertionType(assertionType);
-    if (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());
-            return;
-        }
-
-        RBSTarget *target = [RBSTarget targetWithPid:pid];
-        RBSDomainAttribute *domainAttribute = [RBSDomainAttribute attributeWithDomain:@"com.apple.webkit" name:runningBoardAssertionName];
-        m_rbsAssertion = adoptNS([[RBSAssertion alloc] initWithExplanation:reason target:target attributes:@[domainAttribute]]);
-
-        m_delegate = adoptNS([[WKRBSAssertionDelegate alloc] init]);
-        [m_rbsAssertion addObserver:m_delegate.get()];
-        m_delegate.get().invalidationCallback = ^{
-            RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion() RBS %{public}@ assertion for process with PID %d was invalidated", this, runningBoardAssertionName, pid);
-            processAssertionWasInvalidated();
-        };
-
-        NSError *acquisitionError = nil;
-        if (![m_rbsAssertion acquireWithError:&acquisitionError]) {
-            RELEASE_LOG_ERROR(ProcessSuspension, "%p - ProcessAssertion: Failed to acquire RBS %{public}@ assertion '%{public}s' for process with PID %d, error: %{public}@", this, runningBoardAssertionName, reason.utf8().data(), pid, acquisitionError);
-            dispatch_async(dispatch_get_main_queue(), ^{
-                if (weakThis)
-                    processAssertionWasInvalidated();
-            });
-        } else
-            RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion: Successfully took RBS %{public}@ assertion '%{public}s' for process with PID %d", this, runningBoardAssertionName, reason.utf8().data(), pid);
-    } else {
+
+#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
+    if (!runningBoardAssertionName) {
         // Legacy code path.
         BKSProcessAssertionAcquisitionHandler handler = ^(BOOL acquired) {
@@ -415 +398 @@
             });
         };
-    }
+        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());
+        return;
+    }
+
+    RBSTarget *target = [RBSTarget targetWithPid:pid];
+    RBSDomainAttribute *domainAttribute = [RBSDomainAttribute attributeWithDomain:@"com.apple.webkit" name:runningBoardAssertionName];
+    m_rbsAssertion = adoptNS([[RBSAssertion alloc] initWithExplanation:reason target:target attributes:@[domainAttribute]]);
+
+    m_delegate = adoptNS([[WKRBSAssertionDelegate alloc] init]);
+    [m_rbsAssertion addObserver:m_delegate.get()];
+    m_delegate.get().invalidationCallback = ^{
+        RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion() RBS %{public}@ assertion for process with PID %d was invalidated", this, runningBoardAssertionName, pid);
+        processAssertionWasInvalidated();
+    };
+
+    NSError *acquisitionError = nil;
+    if (![m_rbsAssertion acquireWithError:&acquisitionError]) {
+        RELEASE_LOG_ERROR(ProcessSuspension, "%p - ProcessAssertion: Failed to acquire RBS %{public}@ assertion '%{public}s' for process with PID %d, error: %{public}@", this, runningBoardAssertionName, reason.utf8().data(), pid, acquisitionError);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (weakThis)
+                processAssertionWasInvalidated();
+        });
+    } else
+        RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion: Successfully took RBS %{public}@ assertion '%{public}s' for process with PID %d", this, runningBoardAssertionName, reason.utf8().data(), pid);
 }
 
@@ -428 +440 @@
         [m_rbsAssertion removeObserver:m_delegate.get()];
         [m_rbsAssertion invalidate];
-    } else {
+    }
+
+#if !HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
+    if (m_bksAssertion) {
         m_bksAssertion.get().invalidationHandler = nil;
         [m_bksAssertion invalidate];
     }
+#endif
 }