windows: Updated code to support multiple flutter windows

pichillilorenzo · pichillilorenzo · commit 952aa783912c · 2024-10-09T00:00:48.000+02:00
diff --git a/flutter_inappwebview_windows/CHANGELOG.md b/flutter_inappwebview_windows/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.0
+
+- Updated code to support multiple flutter windows
+
 ## 0.5.0+2
 
 - Fixed `InAppWebViewController.callAsyncJavaScript` not working with JSON objects
diff --git a/flutter_inappwebview_windows/pubspec.yaml b/flutter_inappwebview_windows/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_inappwebview_windows
 description: Windows implementation of the flutter_inappwebview plugin.
-version: 0.5.0+2
+version: 0.6.0
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_windows
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
diff --git a/flutter_inappwebview_windows/windows/cookie_manager.cpp b/flutter_inappwebview_windows/windows/cookie_manager.cpp
@@ -25,7 +25,7 @@ namespace flutter_inappwebview_plugin
 
     auto webViewEnvironmentId = get_optional_fl_map_value<std::string>(arguments, "webViewEnvironmentId");
 
-    auto webViewEnvironment = webViewEnvironmentId.has_value() && map_contains(plugin->webViewEnvironmentManager->webViewEnvironments, webViewEnvironmentId.value())
+    auto webViewEnvironment = plugin && webViewEnvironmentId.has_value() && map_contains(plugin->webViewEnvironmentManager->webViewEnvironments, webViewEnvironmentId.value())
       ? plugin->webViewEnvironmentManager->webViewEnvironments.at(webViewEnvironmentId.value()).get() : nullptr;
 
     auto result_ = std::shared_ptr<flutter::MethodResult<flutter::EncodableValue>>(std::move(result));
diff --git a/flutter_inappwebview_windows/windows/custom_platform_view/custom_platform_view.cc b/flutter_inappwebview_windows/windows/custom_platform_view/custom_platform_view.cc
@@ -186,12 +186,21 @@ namespace flutter_inappwebview_plugin
     event_channel_->SetStreamHandler(std::move(handler));
   }
 
+  void CustomPlatformView::UnregisterMethodCallHandler() const
+  {
+    if (method_channel_) {
+      method_channel_->SetMethodCallHandler(nullptr);
+      if (view && view->channelDelegate) {
+        view->channelDelegate->UnregisterMethodCallHandler();
+      }
+    }
+  }
+
   CustomPlatformView::~CustomPlatformView()
   {
     debugLog("dealloc CustomPlatformView");
-    method_channel_->SetMethodCallHandler(nullptr);
     event_sink_ = nullptr;
-    texture_registrar_->UnregisterTexture(texture_id_);
+    texture_registrar_->UnregisterTexture(texture_id_, nullptr);
   }
 
   void CustomPlatformView::RegisterEventHandlers()
diff --git a/flutter_inappwebview_windows/windows/custom_platform_view/custom_platform_view.h b/flutter_inappwebview_windows/windows/custom_platform_view/custom_platform_view.h
@@ -29,6 +29,8 @@ namespace flutter_inappwebview_plugin
     TextureBridge* texture_bridge() const { return texture_bridge_.get(); }
 
     int64_t texture_id() const { return texture_id_; }
+
+    void UnregisterMethodCallHandler() const;
   private:
     HWND hwnd_;
     std::unique_ptr<flutter::TextureVariant> flutter_texture_;
diff --git a/flutter_inappwebview_windows/windows/flutter_inappwebview_windows_plugin.cpp b/flutter_inappwebview_windows/windows/flutter_inappwebview_windows_plugin.cpp
@@ -33,5 +33,11 @@ namespace flutter_inappwebview_plugin
   }
 
   FlutterInappwebviewWindowsPlugin::~FlutterInappwebviewWindowsPlugin()
-  {}
+  {
+    webViewEnvironmentManager = nullptr;
+    inAppWebViewManager = nullptr;
+    inAppBrowserManager = nullptr;
+    headlessInAppWebViewManager = nullptr;
+    cookieManager = nullptr;
+  }
 }
diff --git a/flutter_inappwebview_windows/windows/headless_in_app_webview/headless_in_app_webview_manager.cpp b/flutter_inappwebview_windows/windows/headless_in_app_webview/headless_in_app_webview_manager.cpp
@@ -46,6 +46,11 @@ namespace flutter_inappwebview_plugin
   {
     auto result_ = std::shared_ptr<flutter::MethodResult<flutter::EncodableValue>>(std::move(result));
 
+    if (!plugin) {
+      result_->Error("0", "Cannot create the HeadlessInAppWebView instance!");
+      return;
+    }
+
     auto id = get_fl_map_value<std::string>(*arguments, "id");
     auto params = get_fl_map_value<flutter::EncodableMap>(*arguments, "params");
 
@@ -80,7 +85,7 @@ namespace flutter_inappwebview_plugin
         wil::com_ptr<ICoreWebView2Controller> webViewController,
         wil::com_ptr<ICoreWebView2CompositionController> webViewCompositionController)
       {
-        if (webViewEnv && webViewController) {
+        if (plugin && webViewEnv && webViewController) {
           std::optional<std::vector<std::shared_ptr<UserScript>>> initialUserScripts = initialUserScriptList.has_value() ?
             functional_map(initialUserScriptList.value(), [](const flutter::EncodableValue& map) { return std::make_shared<UserScript>(std::get<flutter::EncodableMap>(map)); }) :
             std::optional<std::vector<std::shared_ptr<UserScript>>>{};
diff --git a/flutter_inappwebview_windows/windows/headless_in_app_webview/headless_webview_channel_delegate.cpp b/flutter_inappwebview_windows/windows/headless_in_app_webview/headless_webview_channel_delegate.cpp
@@ -29,6 +29,12 @@ namespace flutter_inappwebview_plugin
         std::map<std::string, std::unique_ptr<HeadlessInAppWebView>>& webViews = webView->plugin->headlessInAppWebViewManager->webViews;
         auto& id = webView->id;
         if (map_contains(webViews, id)) {
+          if (webView->channelDelegate) {
+            webView->channelDelegate->UnregisterMethodCallHandler();
+            if (webView->webView && webView->webView->channelDelegate) {
+              webView->webView->channelDelegate->UnregisterMethodCallHandler();
+            }
+          }
           webViews.erase(id);
         }
       }
diff --git a/flutter_inappwebview_windows/windows/in_app_browser/in_app_browser.cpp b/flutter_inappwebview_windows/windows/in_app_browser/in_app_browser.cpp
@@ -200,12 +200,18 @@ namespace flutter_inappwebview_plugin
       if (!destroyed_) {
         destroyed_ = true;
 
-        webView.reset();
-
         if (channelDelegate) {
           channelDelegate->onExit();
         }
 
+        if (channelDelegate) {
+          channelDelegate->UnregisterMethodCallHandler();
+          if (webView && webView->channelDelegate) {
+            webView->channelDelegate->UnregisterMethodCallHandler();
+          }
+        }
+        webView.reset();
+
         if (plugin && plugin->inAppBrowserManager) {
           plugin->inAppBrowserManager->browsers.erase(id);
         }
diff --git a/flutter_inappwebview_windows/windows/in_app_browser/in_app_browser_manager.cpp b/flutter_inappwebview_windows/windows/in_app_browser/in_app_browser_manager.cpp
@@ -25,8 +25,14 @@ namespace flutter_inappwebview_plugin
     auto& methodName = method_call.method_name();
 
     if (string_equals(methodName, "open")) {
-      createInAppBrowser(arguments);
-      result->Success(true);
+      if (plugin) {
+        createInAppBrowser(arguments);
+        result->Success(true);
+      }
+      else {
+        result->Error("0", "Cannot create the InAppBrowser instance!");
+
+      }
     }
     else if (string_equals(methodName, "openWithSystemBrowser")) {
       auto url = get_fl_map_value<std::string>(*arguments, "url");
diff --git a/flutter_inappwebview_windows/windows/in_app_webview/in_app_webview_manager.cpp b/flutter_inappwebview_windows/windows/in_app_webview/in_app_webview_manager.cpp
@@ -18,29 +18,32 @@ namespace flutter_inappwebview_plugin
 {
   InAppWebViewManager::InAppWebViewManager(const FlutterInappwebviewWindowsPlugin* plugin)
     : plugin(plugin),
-    ChannelDelegate(plugin->registrar->messenger(), InAppWebViewManager::METHOD_CHANNEL_NAME),
-    rohelper_(std::make_unique<rx::RoHelper>(RO_INIT_SINGLETHREADED))
+    ChannelDelegate(plugin->registrar->messenger(), InAppWebViewManager::METHOD_CHANNEL_NAME)
   {
-    if (rohelper_->WinRtAvailable()) {
-      DispatcherQueueOptions options{ sizeof(DispatcherQueueOptions),
-                                     DQTYPE_THREAD_CURRENT, DQTAT_COM_STA };
-
-      if (FAILED(rohelper_->CreateDispatcherQueueController(
-        options, dispatcher_queue_controller_.put()))) {
-        std::cerr << "Creating DispatcherQueueController failed." << std::endl;
-        return;
-      }
+    if (!rohelper_) {
+      rohelper_ = std::make_unique<rx::RoHelper>(RO_INIT_SINGLETHREADED);
 
-      if (!isGraphicsCaptureSessionSupported()) {
-        std::cerr << "Windows::Graphics::Capture::GraphicsCaptureSession is not "
-          "supported."
-          << std::endl;
-        return;
-      }
+      if (rohelper_->WinRtAvailable()) {
+        DispatcherQueueOptions options{ sizeof(DispatcherQueueOptions),
+                                       DQTYPE_THREAD_CURRENT, DQTAT_COM_STA };
+
+        if (FAILED(rohelper_->CreateDispatcherQueueController(
+          options, dispatcher_queue_controller_.put()))) {
+          std::cerr << "Creating DispatcherQueueController failed." << std::endl;
+          return;
+        }
+
+        if (!isGraphicsCaptureSessionSupported()) {
+          std::cerr << "Windows::Graphics::Capture::GraphicsCaptureSession is not "
+            "supported."
+            << std::endl;
+          return;
+        }
 
-      graphics_context_ = std::make_unique<GraphicsContext>(rohelper_.get());
-      compositor_ = graphics_context_->CreateCompositor();
-      valid_ = graphics_context_->IsValid();
+        graphics_context_ = std::make_unique<GraphicsContext>(rohelper_.get());
+        compositor_ = graphics_context_->CreateCompositor();
+        valid_ = graphics_context_->IsValid();
+      }
     }
 
     windowClass_.lpszClassName = CustomPlatformView::CLASS_NAME;
@@ -66,6 +69,10 @@ namespace flutter_inappwebview_plugin
     else if (string_equals(methodName, "dispose")) {
       auto id = get_fl_map_value<int64_t>(*arguments, "id");
       if (map_contains(webViews, (uint64_t)id)) {
+        auto platformView = webViews.at(id).get();
+        if (platformView) {
+          platformView->UnregisterMethodCallHandler();
+        }
         webViews.erase(id);
       }
       result->Success();
@@ -84,6 +91,11 @@ namespace flutter_inappwebview_plugin
   {
     auto result_ = std::shared_ptr<flutter::MethodResult<flutter::EncodableValue>>(std::move(result));
 
+    if (!plugin) {
+      result_->Error("0", "Cannot create the InAppWebView instance!");
+      return;
+    }
+
     auto settingsMap = get_fl_map_value<flutter::EncodableMap>(*arguments, "initialSettings");
     auto urlRequestMap = get_optional_fl_map_value<flutter::EncodableMap>(*arguments, "initialUrlRequest");
     auto initialFile = get_optional_fl_map_value<std::string>(*arguments, "initialFile");
@@ -126,7 +138,7 @@ namespace flutter_inappwebview_plugin
         wil::com_ptr<ICoreWebView2Controller> webViewController,
         wil::com_ptr<ICoreWebView2CompositionController> webViewCompositionController)
       {
-        if (webViewEnv && webViewController && webViewCompositionController) {
+        if (plugin && webViewEnv && webViewController && webViewCompositionController) {
           std::optional<std::vector<std::shared_ptr<UserScript>>> initialUserScripts = initialUserScriptList.has_value() ?
             functional_map(initialUserScriptList.value(), [](const flutter::EncodableValue& map) { return std::make_shared<UserScript>(std::get<flutter::EncodableMap>(map)); }) :
             std::optional<std::vector<std::shared_ptr<UserScript>>>{};
@@ -186,6 +198,10 @@ namespace flutter_inappwebview_plugin
   void InAppWebViewManager::disposeKeepAlive(const std::string& keepAliveId)
   {
     if (map_contains(keepAliveWebViews, keepAliveId)) {
+      auto platformView = keepAliveWebViews.at(keepAliveId).get();
+      if (platformView) {
+        platformView->UnregisterMethodCallHandler();
+      }
       keepAliveWebViews.erase(keepAliveId);
     }
   }
diff --git a/flutter_inappwebview_windows/windows/in_app_webview/in_app_webview_manager.h b/flutter_inappwebview_windows/windows/in_app_webview/in_app_webview_manager.h
@@ -52,13 +52,13 @@ namespace flutter_inappwebview_plugin
     void createInAppWebView(const flutter::EncodableMap* arguments, std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
     void disposeKeepAlive(const std::string& keepAliveId);
   private:
-    std::unique_ptr<rx::RoHelper> rohelper_;
-    winrt::com_ptr<ABI::Windows::System::IDispatcherQueueController>
-      dispatcher_queue_controller_;
-    std::unique_ptr<GraphicsContext> graphics_context_;
-    winrt::com_ptr<ABI::Windows::UI::Composition::ICompositor> compositor_;
+    inline static std::shared_ptr<rx::RoHelper> rohelper_ = nullptr;
+    inline static winrt::com_ptr<ABI::Windows::System::IDispatcherQueueController>
+      dispatcher_queue_controller_ = nullptr;
+    inline static std::unique_ptr<GraphicsContext> graphics_context_ = nullptr;
+    inline static winrt::com_ptr<ABI::Windows::UI::Composition::ICompositor> compositor_ = nullptr;
     WNDCLASS windowClass_ = {};
-    bool valid_ = false;
+    inline static bool valid_ = false;
   };
 }
 #endif //FLUTTER_INAPPWEBVIEW_PLUGIN_IN_APP_WEBVIEW_MANAGER_H_
diff --git a/flutter_inappwebview_windows/windows/types/channel_delegate.cpp b/flutter_inappwebview_windows/windows/types/channel_delegate.cpp
@@ -24,12 +24,16 @@ namespace flutter_inappwebview_plugin
     std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result)
   {}
 
-  ChannelDelegate::~ChannelDelegate()
+  void ChannelDelegate::UnregisterMethodCallHandler() const
   {
-    messenger = nullptr;
-    if (channel != nullptr) {
+    if (channel) {
       channel->SetMethodCallHandler(nullptr);
     }
+  }
+
+  ChannelDelegate::~ChannelDelegate()
+  {
+    messenger = nullptr;
     channel.reset();
   }
 }
diff --git a/flutter_inappwebview_windows/windows/types/channel_delegate.h b/flutter_inappwebview_windows/windows/types/channel_delegate.h
@@ -19,6 +19,8 @@ namespace flutter_inappwebview_plugin
     virtual void HandleMethodCall(
       const flutter::MethodCall<flutter::EncodableValue>& method_call,
       std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
+
+    void UnregisterMethodCallHandler() const;
   };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,11 @@ namespace flutter_inappwebview_plugin`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`FlutterInappwebviewWindowsPlugin::~FlutterInappwebviewWindowsPlugin()`
`36`		`- {}`
	`36`	`+ {`
	`37`	`+ webViewEnvironmentManager = nullptr;`
	`38`	`+ inAppWebViewManager = nullptr;`
	`39`	`+ inAppBrowserManager = nullptr;`
	`40`	`+ headlessInAppWebViewManager = nullptr;`
	`41`	`+ cookieManager = nullptr;`
	`42`	`+ }`
`37`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,12 @@ namespace flutter_inappwebview_plugin`
`29`	`29`	`std::map<std::string, std::unique_ptr<HeadlessInAppWebView>>& webViews = webView->plugin->headlessInAppWebViewManager->webViews;`
`30`	`30`	`auto& id = webView->id;`
`31`	`31`	`if (map_contains(webViews, id)) {`
	`32`	`+ if (webView->channelDelegate) {`
	`33`	`+ webView->channelDelegate->UnregisterMethodCallHandler();`
	`34`	`+ if (webView->webView && webView->webView->channelDelegate) {`
	`35`	`+ webView->webView->channelDelegate->UnregisterMethodCallHandler();`
	`36`	`+ }`
	`37`	`+ }`
`32`	`38`	`webViews.erase(id);`
`33`	`39`	`}`
`34`	`40`	`}`