fix: use GetFrameByIdentifier when CEF_VERSION_MAJOR > 121

CefView · Sep 14, 2024 · 6a27a57 · 6a27a57
1 parent b72710d
commit 6a27a57
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,6 +111,7 @@ if(NOT CEF_SDK_VERSION)
   # "119.4.4+g5d1e039+chromium-119.0.6045.199"  # GOOD
   # "120.1.6+gf08b1fd+chromium-120.0.6099.71"   # GOOD
   # "121.3.15+g4d3b0b4+chromium-121.0.6167.184" # GOOD
+  # "122.1.7+gdd187af+chromium-122.0.6261.29"
   set(DEFAULT_CEF_SDK_VER "119.4.4+g5d1e039+chromium-119.0.6045.199")
   message(STATUS
     "CEF_SDK_VERSION is empty, use default version ${DEFAULT_CEF_SDK_VER}\n"

diff --git a/cmake/DownloadCef.cmake b/cmake/DownloadCef.cmake
@@ -2,6 +2,7 @@
 # Generally, there is NO NEED to modify the following config
 #
 # Download CEF binary package
+# https://cef-builds.spotifycdn.com/index.html
 #
 if(NOT CEF_SDK_VERSION)
   message(FATAL_ERROR "CEF_SDK_VERSION is missing!")

diff --git a/linux-arm-gen.sh b/linux-arm-gen.sh
diff --git a/linux-arm64-gen.sh b/linux-arm64-gen.sh
diff --git a/linux-x86-gen.sh b/linux-x86-gen.sh
diff --git a/linux-x86_64-gen.sh b/linux-x86_64-gen.sh
diff --git a/mac-arm64-gen.sh b/mac-arm64-gen.sh
diff --git a/mac-x86_64-gen.sh b/mac-x86_64-gen.sh
diff --git a/src/CefView/CefBrowserApp/CefViewBrowserClient.cpp b/src/CefView/CefBrowserApp/CefViewBrowserClient.cpp
@@ -1,4 +1,4 @@
-#include <CefViewBrowserClient.h>
+#include <CefViewBrowserClient.h>
 
 #pragma region std_headers
 #include <sstream>
@@ -106,7 +106,12 @@ CefViewBrowserClient::TriggerEvent(CefRefPtr<CefBrowser> browser,
 
     for (auto id : frameIds) {
       auto m = msg->Copy();
+#if CEF_VERSION_MAJOR > 121
       auto frame = browser->GetFrameByIdentifier(id);
+#else
+      auto frame = browser->GetFrame(id);
+#endif
+
       frame->SendProcessMessage(PID_RENDERER, m);
     }