feat: adopted to CEF version 131+

CefView · Feb 14, 2025 · dbc510c · dbc510c
1 parent bb1cbae
commit dbc510c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/cmake/SetupCef.cmake b/cmake/SetupCef.cmake
@@ -48,7 +48,7 @@ if(NOT CUSTOM_CEF_SDK_DIR)
   set(CEF_SDK_EXTRACTED_DIR "${CEF_SDK_WORKSPACE}/${CEF_SDK_PACKAGE_NAME}")
   file(GLOB CEF_SDK_DIR "${CEF_SDK_EXTRACTED_DIR}")
 else()
-  message("Custom Cef path: ${CUSTOM_CEF_SDK_DIR}")
+  message(STATUS "CUSTOM_CEF_SDK_DIR set: ${CUSTOM_CEF_SDK_DIR}")
   set(CEF_SDK_DIR "${CUSTOM_CEF_SDK_DIR}")
 endif()
 

diff --git a/include/CefViewBrowserClient.h b/include/CefViewBrowserClient.h
@@ -333,6 +333,9 @@ class CefViewBrowserClient
   virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() override;
   virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
                              CefRefPtr<CefFrame> frame,
+#if CEF_VERSION_MAJOR > 131
+                             int popup_id,
+#endif
                              const CefString& target_url,
                              const CefString& target_frame_name,
                              CefLifeSpanHandler::WindowOpenDisposition target_disposition,

diff --git a/src/CefView/CefBrowserApp/CefViewBrowserClient_LifeSpanHandler.cpp b/src/CefView/CefBrowserApp/CefViewBrowserClient_LifeSpanHandler.cpp
@@ -19,6 +19,9 @@ CefViewBrowserClient::GetLifeSpanHandler()
 bool
 CefViewBrowserClient::OnBeforePopup(CefRefPtr<CefBrowser> browser,
                                     CefRefPtr<CefFrame> frame,
+#if CEF_VERSION_MAJOR > 131
+                                    int popup_id,
+#endif
                                     const CefString& target_url,
                                     const CefString& target_frame_name,
                                     CefLifeSpanHandler::WindowOpenDisposition target_disposition,