Changeset 240828 in webkit

Timestamp:

Jan 31, 2019 4:34:58 PM (5 years ago)

Author:

jiewen_tan@apple.com

Message:

Unreviewed, build fix after r240805

This patch reverts the BlockPtr change since it breaks iOS builds.

• UIProcess/Cocoa/NavigationState.mm:

(WebKit::tryInterceptNavigation):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-31  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Unreviewed, build fix after r240805
+
+        This patch reverts the BlockPtr change since it breaks iOS builds.
+
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::tryInterceptNavigation):
+
 2019-01-31  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm

@@ -480 +480 @@
 #if HAVE(APP_LINKS)
     if (navigationAction->shouldOpenAppLinks()) {
-        auto callback = makeBlockPtr([request = navigationAction->request().isolatedCopy(), weakPage = makeWeakPtr(page), completionHandler = WTFMove(completionHandler)] (BOOL success, NSError *) mutable {
-            RunLoop::main().dispatch([request = request.isolatedCopy(), weakPage, completionHandler = WTFMove(completionHandler), success]() mutable {
-                if (!success && weakPage) {
-                    tryOptimizingLoad(request, *weakPage, WTFMove(completionHandler));
-                    return;
-                }
-                completionHandler(success);
+        auto* localCompletionHandler = new WTF::Function<void (bool)>([request = navigationAction->request().isolatedCopy(), weakPage = makeWeakPtr(page), completionHandler = WTFMove(completionHandler)] (bool success) mutable {
+            ASSERT(RunLoop::isMain());
+            if (!success && weakPage) {
+                tryOptimizingLoad(request, *weakPage, WTFMove(completionHandler));
+                return;
+            }
+            completionHandler(success);
+        });
+        [LSAppLink openWithURL:navigationAction->request().url() completionHandler:[localCompletionHandler](BOOL success, NSError *) {
+            dispatch_async(dispatch_get_main_queue(), [localCompletionHandler, success] {
+                (*localCompletionHandler)(success);
+                delete localCompletionHandler;
             });
-        });
-        [LSAppLink openWithURL:navigationAction->request().url() completionHandler:callback.get()];
+        }];
         return;
     }