fix: ensure CefViewBrowserClient::CloseAllBrowsers logic is always executed in CEF UI thread

Author: tishion

include/CefViewCoreGlobal.h

@@ -17,8 +17,9 @@
 #pragma region cef_headers
 #include <include/cef_app.h>
 #include <include/cef_client.h>
-#include <include/cef_version.h>
 #include <include/cef_parser.h>
+#include <include/cef_task.h>
+#include <include/cef_version.h>
 #include <include/wrapper/cef_helpers.h>
 #include <include/wrapper/cef_message_router.h>
 #include <include/wrapper/cef_resource_manager.h>
@@ -41,4 +42,36 @@ struct std::hash<CefFrameId>
 };
 #endif // CEF_VERSION_MAJOR < 122
 
+/// <summary>
+/// Task for rendering operations.
+/// </summary>
+class CefLambdaTask : public CefTask
+{
+  IMPLEMENT_REFCOUNTING(CefLambdaTask);
+
+  /// <summary>
+  /// Function that contains the lambda work to be executed.
+  /// </summary>
+  std::function<void()> work;
+
+public:
+  /// <summary>
+  /// Constructor for the task.
+  /// </summary>
+  CefLambdaTask(std::function<void()>&& t)
+    : work(std::move(t))
+  {
+  }
+
+  /// <summary>
+  /// Executes the task.
+  /// </summary>
+  void Execute() override
+  {
+    if (work) {
+      work();
+    }
+  }
+};
+
 #endif // CefViewCoreGlobal_h

src/CefView/CefBrowserApp/CefViewBrowserClient.cpp

@@ -50,11 +50,26 @@ CefViewBrowserClient::~CefViewBrowserClient()
 void
 CefViewBrowserClient::CloseAllBrowsers()
 {
-  close_by_native_ = true;
-  auto browsers = browser_map_;
-  for (auto& kv : browsers) {
-    kv.second->StopLoad();
-    kv.second->GetHost()->CloseBrowser(true);
+  CefRefPtr<CefViewBrowserClient> self = this;
+  auto closeTask = [self]() {
+    // set flags
+    self->is_closing_ = true;
+    self->close_by_native_ = true;
+
+    // close all browser in current client instance
+    auto browserMap = self->browser_map_;
+    for (auto& kv : browserMap) {
+      if (kv.second) {
+        kv.second->StopLoad();
+        kv.second->GetHost()->CloseBrowser(true);
+      }
+    }
+  };
+
+  if (CefCurrentlyOn(TID_UI)) {
+    closeTask();
+  } else {
+    CefPostTask(TID_UI, new CefLambdaTask(std::move(closeTask)));
   }
 }
 

src/CefView/CefBrowserApp/CefViewBrowserClient_LifeSpanHandler.cpp

@@ -41,8 +41,7 @@ CefViewBrowserClient::OnBeforePopup(CefRefPtr<CefBrowser> browser,
 
   bool result = false;
 
-  auto delegate = client_delegate_.lock();
-  if (delegate) {
+  if (auto delegate = client_delegate_.lock()) {
     bool disableJSAccess = no_javascript_access ? *no_javascript_access : false;
     result = delegate->onBeforePopup(browser,
                                      frame,
@@ -78,9 +77,9 @@ CefViewBrowserClient::OnAfterCreated(CefRefPtr<CefBrowser> browser)
     message_router_->AddHandler(message_router_handler_.get(), false);
   }
 
-  auto delegate = client_delegate_.lock();
-  if (delegate)
+  if (auto delegate = client_delegate_.lock()) {
     delegate->onAfterCreate(browser);
+  }
 
   browser_map_[browser->GetIdentifier()] = browser;
 }
@@ -90,14 +89,14 @@ CefViewBrowserClient::DoClose(CefRefPtr<CefBrowser> browser)
 {
   CEF_REQUIRE_UI_THREAD();
 
-  bool ignoreClose = false;
-
   if (browser->IsPopup()) {
-    return ignoreClose;
+    // return false for pop-up browser
+    return false;
   }
 
-  auto delegate = client_delegate_.lock();
-  if (delegate) {
+  bool ignoreClose = false;
+
+  if (auto delegate = client_delegate_.lock()) {
     if (close_by_native_) {
       // close by native
       ignoreClose = delegate->doClose(browser);
@@ -119,9 +118,9 @@ CefViewBrowserClient::OnBeforeClose(CefRefPtr<CefBrowser> browser)
 {
   CEF_REQUIRE_UI_THREAD();
 
-  auto delegate = client_delegate_.lock();
-  if (delegate)
+  if (auto delegate = client_delegate_.lock()) {
     delegate->onBeforeClose(browser);
+  }
 
   message_router_->OnBeforeClose(browser);
 

src/CefView/CefBrowserApp/CefViewBrowserClient_LoadHandler.cpp

@@ -73,9 +73,10 @@ CefViewBrowserClient::OnLoadError(CefRefPtr<CefBrowser> browser,
   if (errorCode == ERR_ABORTED)
     return;
 
-  // If the browser is closing, block the popup
-  if (is_closing_)
+  // If the browser is closing, block the pop-up
+  if (is_closing_) {
     return;
+  }
 
   auto msg = errorText.ToString();
   auto url = failedUrl.ToString();