Changeset 233165 in webkit

Timestamp:

Jun 25, 2018 12:54:21 PM (6 years ago)

Author:

Chris Dumez

Message:

Make sure API::IconLoadingClient::getLoadDecisionForIcon()'s completion handler gets called
​https://bugs.webkit.org/show_bug.cgi?id=187007
<rdar://problem/41293989>

Reviewed by Brady Eidson.

Make sure API::IconLoadingClient::getLoadDecisionForIcon()'s completion handler gets called by
switching its type to WTF::CompletionHandler instead of WTF::Function. This also has the benefit
of destroying our captured objects when the completion handler gets called by the client on the
main thread instead of whatever thread the ObjC block gets released on.

• UIProcess/API/APIIconLoadingClient.h:

(API::IconLoadingClient::getLoadDecisionForIcon):

• UIProcess/API/glib/WebKitIconLoadingClient.cpp:
• UIProcess/API/mac/WKView.mm:

(-[WKView maybeInstallIconLoadingClient]):

• UIProcess/Cocoa/IconLoadingDelegate.h:
• UIProcess/Cocoa/IconLoadingDelegate.mm:

(WebKit::IconLoadingDelegate::IconLoadingClient::getLoadDecisionForIcon):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIIconLoadingClient.h (modified) (2 diffs)
• UIProcess/API/glib/WebKitIconLoadingClient.cpp (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)
• UIProcess/Cocoa/IconLoadingDelegate.h (modified) (1 diff)
• UIProcess/Cocoa/IconLoadingDelegate.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-06-25  Chris Dumez  <cdumez@apple.com>
+
+        Make sure API::IconLoadingClient::getLoadDecisionForIcon()'s completion handler gets called
+        https://bugs.webkit.org/show_bug.cgi?id=187007
+        <rdar://problem/41293989>
+
+        Reviewed by Brady Eidson.
+
+        Make sure API::IconLoadingClient::getLoadDecisionForIcon()'s completion handler gets called by
+        switching its type to WTF::CompletionHandler instead of WTF::Function. This also has the benefit
+        of destroying our captured objects when the completion handler gets called by the client on the
+        main thread instead of whatever thread the ObjC block gets released on.
+
+        * UIProcess/API/APIIconLoadingClient.h:
+        (API::IconLoadingClient::getLoadDecisionForIcon):
+        * UIProcess/API/glib/WebKitIconLoadingClient.cpp:
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView maybeInstallIconLoadingClient]):
+        * UIProcess/Cocoa/IconLoadingDelegate.h:
+        * UIProcess/Cocoa/IconLoadingDelegate.mm:
+        (WebKit::IconLoadingDelegate::IconLoadingClient::getLoadDecisionForIcon):
+
 2018-06-25  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/API/APIIconLoadingClient.h

@@ -28 +28 @@
 #include "GenericCallback.h"
 #include <WebCore/LinkIcon.h>
+#include <wtf/CompletionHandler.h>
 #include <wtf/Function.h>
 
@@ -40 +41 @@
     virtual ~IconLoadingClient() { }
 
-    virtual void getLoadDecisionForIcon(const WebCore::LinkIcon&, WTF::Function<void (WTF::Function<void (API::Data*, WebKit::CallbackBase::Error)>&&)>&& completionHandler) {
+    virtual void getLoadDecisionForIcon(const WebCore::LinkIcon&, WTF::CompletionHandler<void(WTF::Function<void(API::Data*, WebKit::CallbackBase::Error)>&&)>&& completionHandler)
+    {
         completionHandler(nullptr);
     }

trunk/Source/WebKit/UIProcess/API/glib/WebKitIconLoadingClient.cpp

@@ -34 +34 @@
 
 private:
-    void getLoadDecisionForIcon(const WebCore::LinkIcon& icon, Function<void (Function<void (API::Data*, CallbackBase::Error)>&&)>&& completionHandler) override
+    void getLoadDecisionForIcon(const WebCore::LinkIcon& icon, CompletionHandler<void(Function<void(API::Data*, CallbackBase::Error)>&&)>&& completionHandler) override
     {
         // WebCore can send non HTTP icons.

trunk/Source/WebKit/UIProcess/API/mac/WKView.mm

@@ -884 +884 @@
         typedef void (^IconLoadCompletionHandler)(NSData*);
 
-        void getLoadDecisionForIcon(const WebCore::LinkIcon& linkIcon, WTF::Function<void (WTF::Function<void (API::Data*, WebKit::CallbackBase::Error)>&&)>&& completionHandler) override {
+        void getLoadDecisionForIcon(const WebCore::LinkIcon& linkIcon, WTF::CompletionHandler<void(WTF::Function<void(API::Data*, WebKit::CallbackBase::Error)>&&)>&& completionHandler) override
+        {
             RetainPtr<_WKLinkIconParameters> parameters = adoptNS([[_WKLinkIconParameters alloc] _initWithLinkIcon:linkIcon]);
 
             [m_wkView performSelector:delegateSelector() withObject:parameters.get() withObject:BlockPtr<void (IconLoadCompletionHandler)>::fromCallable([completionHandler = WTFMove(completionHandler)](IconLoadCompletionHandler loadCompletionHandler) {
+                ASSERT(RunLoop::isMain());
                 if (loadCompletionHandler) {
                     completionHandler([loadCompletionHandler = BlockPtr<void (NSData *)>(loadCompletionHandler)](API::Data* data, WebKit::CallbackBase::Error error) {

trunk/Source/WebKit/UIProcess/Cocoa/IconLoadingDelegate.h

@@ -56 +56 @@
 
     private:
-        void getLoadDecisionForIcon(const WebCore::LinkIcon&, WTF::Function<void (WTF::Function<void (API::Data*, WebKit::CallbackBase::Error)>&&)>&& completionHandler) override;
+        void getLoadDecisionForIcon(const WebCore::LinkIcon&, WTF::CompletionHandler<void(WTF::Function<void(API::Data*, WebKit::CallbackBase::Error)>&&)>&&) override;
 
         IconLoadingDelegate& m_iconLoadingDelegate;

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

@@ -73 +73 @@
 typedef void (^IconLoadCompletionHandler)(NSData*);
 
-void IconLoadingDelegate::IconLoadingClient::getLoadDecisionForIcon(const WebCore::LinkIcon& linkIcon, WTF::Function<void (WTF::Function<void (API::Data*, WebKit::CallbackBase::Error)>&&)>&& completionHandler)
+void IconLoadingDelegate::IconLoadingClient::getLoadDecisionForIcon(const WebCore::LinkIcon& linkIcon, WTF::CompletionHandler<void(WTF::Function<void(API::Data*, WebKit::CallbackBase::Error)>&&)>&& completionHandler)
 {
     if (!m_iconLoadingDelegate.m_delegateMethods.webViewShouldLoadIconWithParametersCompletionHandler) {
@@ -89 +89 @@
 
     [delegate webView:m_iconLoadingDelegate.m_webView shouldLoadIconWithParameters:parameters.get() completionHandler:BlockPtr<void (IconLoadCompletionHandler loadCompletionHandler)>::fromCallable([completionHandler = WTFMove(completionHandler)] (IconLoadCompletionHandler loadCompletionHandler) {
+        ASSERT(RunLoop::isMain());
         if (loadCompletionHandler) {
             completionHandler([loadCompletionHandler = Block_copy(loadCompletionHandler)](API::Data* data, WebKit::CallbackBase::Error error) {