Optimize identifier check for MacOS

hlwhl · Oct 23, 2024 · 80b18bf · 80b18bf
1 parent ef7cbd0
commit 80b18bf
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/common/webview_handler.cc b/common/webview_handler.cc
@@ -563,8 +563,13 @@ void WebviewHandler::sendJavaScriptChannelCallBack(const bool error, const std::
 
         CefRefPtr<CefFrame> frame = bit->second.browser->GetMainFrame();
 
-        // GetIdentifier().ToString() does not work on MacOS
-        if (std::stoll(stringpatch::to_string(frame->GetIdentifier())) == frameIdInt)
+        // Return types for frame->GetIdentifier() differ between platforms
+#if __APPLE__
+        bool identifierMatch = frame->GetIdentifier() == frameIdInt;
+#else
+        bool identifierMatch = std::stoll(stringpatch::to_string(frame->GetIdentifier())) == frameIdInt;
+#endif
+        if (identifierMatch)
         {
             frame->SendProcessMessage(PID_RENDERER, message);
         }