Changeset 250785 in webkit

Timestamp:

Oct 7, 2019 1:31:01 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Crash in WebKitTestRunnerApp: invocation function for block in WTR::UIScriptControllerIOS::sendEventStream
​https://bugs.webkit.org/show_bug.cgi?id=202646
<rdar://problem/54576522>

Patch by Antoine Quint <Antoine Quint> on 2019-10-07
Reviewed by Tim Horton.

• WebKitTestRunner/ios/UIScriptControllerIOS.mm:

(WTR::UIScriptControllerIOS::sendEventStream):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/ios/UIScriptControllerIOS.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-10-07  Antoine Quint  <graouts@apple.com>
+
+        Crash in WebKitTestRunnerApp: invocation function for block in WTR::UIScriptControllerIOS::sendEventStream
+        https://bugs.webkit.org/show_bug.cgi?id=202646
+        <rdar://problem/54576522>
+
+        Reviewed by Tim Horton.
+
+        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+        (WTR::UIScriptControllerIOS::sendEventStream):
+
 2019-10-07  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm

@@ -44 +44 @@
 #import <WebKit/WebKit.h>
 #import <pal/spi/ios/GraphicsServicesSPI.h>
+#import <wtf/BlockPtr.h>
 #import <wtf/SoftLinking.h>
 #import <wtf/Vector.h>
@@ -426 +427 @@
         return;
     }
-    
-    [[HIDEventGenerator sharedHIDEventGenerator] sendEventStream:eventInfo completionBlock:^{
-        if (!m_context)
-            return;
-        m_context->asyncTaskComplete(callbackID);
-    }];
+
+    auto completion = makeBlockPtr([this, protectedThis = makeRefPtr(*this), callbackID] {
+        if (!m_context)
+            return;
+        m_context->asyncTaskComplete(callbackID);
+    });
+
+    [[HIDEventGenerator sharedHIDEventGenerator] sendEventStream:eventInfo completionBlock:completion.get()];
 }