Title: [280299] trunk/Source/WebKit
Revision
280299
Author
[email protected]
Date
2021-07-26 10:53:42 -0700 (Mon, 26 Jul 2021)

Log Message

Make sure the ProcessAssertion gets destroyed on the main thread
https://bugs.webkit.org/show_bug.cgi?id=228281
<rdar://81048308>

Reviewed by Geoffrey Garen.

Follow-up to r279877 to make sure that the ProcessAssertion gets destroyed on the main thread in
ProcessAssertion::acquireAsync(), even if the completionHandler is null.

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

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (280298 => 280299)


--- trunk/Source/WebKit/ChangeLog	2021-07-26 17:51:09 UTC (rev 280298)
+++ trunk/Source/WebKit/ChangeLog	2021-07-26 17:53:42 UTC (rev 280299)
@@ -1,3 +1,17 @@
+2021-07-26  Chris Dumez  <[email protected]>
+
+        Make sure the ProcessAssertion gets destroyed on the main thread
+        https://bugs.webkit.org/show_bug.cgi?id=228281
+        <rdar://81048308>
+
+        Reviewed by Geoffrey Garen.
+
+        Follow-up to r279877 to make sure that the ProcessAssertion gets destroyed on the main thread in
+        ProcessAssertion::acquireAsync(), even if the completionHandler is null.
+
+        * UIProcess/ios/ProcessAssertionIOS.mm:
+        (WebKit::ProcessAssertion::acquireAsync):
+
 2021-07-26  Jer Noble  <[email protected]>
 
         [iOS] All home screen web apps resume when any home screen web app is foregrounded

Modified: trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm (280298 => 280299)


--- trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm	2021-07-26 17:51:09 UTC (rev 280298)
+++ trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm	2021-07-26 17:53:42 UTC (rev 280299)
@@ -358,11 +358,10 @@
     ASSERT(isMainRunLoop());
     assertionsWorkQueue().dispatch([protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
         protectedThis->acquireSync();
-        if (completionHandler) {
-            RunLoop::main().dispatch([protectedThis = WTFMove(protectedThis), completionHandler = WTFMove(completionHandler)]() mutable {
+        RunLoop::main().dispatch([protectedThis = WTFMove(protectedThis), completionHandler = WTFMove(completionHandler)]() mutable {
+            if (completionHandler)
                 completionHandler();
-            });
-        }
+        });
     });
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to