scoped_nsprotocol

Author: jmagman

shell/platform/darwin/ios/platform_message_handler_ios.h

@@ -6,6 +6,7 @@
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_PLATFORM_MESSAGE_HANDLER_IOS_H_
 
 #include "flutter/fml/platform/darwin/scoped_block.h"
+#include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/fml/task_runner.h"
 #include "flutter/shell/common/platform_message_handler.h"
 #import "flutter/shell/platform/darwin/ios/flutter_task_queue_dispatch.h"
@@ -32,7 +33,7 @@ class PlatformMessageHandlerIos : public PlatformMessageHandler {
                          NSObject<FlutterTaskQueue>* task_queue);
 
   struct HandlerInfo {
-    NSObject<FlutterTaskQueueDispatch>* task_queue;
+    fml::scoped_nsprotocol<NSObject<FlutterTaskQueueDispatch>*> task_queue;
     fml::ScopedBlock<FlutterBinaryMessageHandler> handler;
   };
 

shell/platform/darwin/ios/platform_message_handler_ios.mm

@@ -80,8 +80,8 @@ - (void)dispatch:(dispatch_block_t)block {
         });
       };
 
-      if (handler_info.task_queue) {
-        [handler_info.task_queue dispatch:run_handler];
+      if (handler_info.task_queue.get()) {
+        [handler_info.task_queue.get() dispatch:run_handler];
       } else {
         dispatch_async(dispatch_get_main_queue(), run_handler);
       }
@@ -124,7 +124,8 @@ - (void)dispatch:(dispatch_block_t)block {
   message_handlers_.erase(channel);
   if (handler) {
     message_handlers_[channel] = {
-        .task_queue = (NSObject<FlutterTaskQueueDispatch>*)task_queue,
+        .task_queue =
+            fml::scoped_nsprotocol(static_cast<NSObject<FlutterTaskQueueDispatch>*>(task_queue)),
         .handler =
             fml::ScopedBlock<FlutterBinaryMessageHandler>{
                 handler, fml::scoped_policy::OwnershipPolicy::kRetain},