Unreviewed, fix assertions in layout tests on iOS Simulator after r242666.
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Mar 2019 19:51:25 +0000 (19:51 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Mar 2019 19:51:25 +0000 (19:51 +0000)
Log an error but do not crash if we fail to acquire a ProcessAssertion.

* UIProcess/ios/ProcessAssertionIOS.mm:
(WebKit::ProcessAssertion::ProcessAssertion):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 8331f4c..e832ce7 100644 (file)
@@ -1,5 +1,14 @@
 2019-03-11  Chris Dumez  <cdumez@apple.com>
 
 2019-03-11  Chris Dumez  <cdumez@apple.com>
 
+        Unreviewed, fix assertions in layout tests on iOS Simulator after r242666.
+
+        Log an error but do not crash if we fail to acquire a ProcessAssertion.
+
+        * UIProcess/ios/ProcessAssertionIOS.mm:
+        (WebKit::ProcessAssertion::ProcessAssertion):
+
+2019-03-11  Chris Dumez  <cdumez@apple.com>
+
         WebProcessCache should keep track of processes being added
         https://bugs.webkit.org/show_bug.cgi?id=195538
 
         WebProcessCache should keep track of processes being added
         https://bugs.webkit.org/show_bug.cgi?id=195538
 
index 5b56f59..8c4de3a 100644 (file)
@@ -165,7 +165,6 @@ ProcessAssertion::ProcessAssertion(pid_t pid, const String& name, AssertionState
     BKSProcessAssertionAcquisitionHandler handler = ^(BOOL acquired) {
         if (!acquired) {
             RELEASE_LOG_ERROR(ProcessSuspension, " %p - ProcessAssertion() PID %d Unable to acquire assertion for process with PID %d", this, getpid(), pid);
     BKSProcessAssertionAcquisitionHandler handler = ^(BOOL acquired) {
         if (!acquired) {
             RELEASE_LOG_ERROR(ProcessSuspension, " %p - ProcessAssertion() PID %d Unable to acquire assertion for process with PID %d", this, getpid(), pid);
-            ASSERT_NOT_REACHED();
             dispatch_async(dispatch_get_main_queue(), ^{
                 if (weakThis)
                     processAssertionWasInvalidated();
             dispatch_async(dispatch_get_main_queue(), ^{
                 if (weakThis)
                     processAssertionWasInvalidated();