From dbc510c94ceaf0797ffef9218fb6230faa54a55e Mon Sep 17 00:00:00 2001 From: Sheen Tian <5869938+tishion@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:35:21 +0800 Subject: [PATCH] feat: adopted to CEF version 131+ --- cmake/SetupCef.cmake | 2 +- include/CefViewBrowserClient.h | 3 +++ .../CefBrowserApp/CefViewBrowserClient_LifeSpanHandler.cpp | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/SetupCef.cmake b/cmake/SetupCef.cmake index 9e472e4..3a112df 100644 --- 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 index 958ff5c..94123e8 100644 --- a/include/CefViewBrowserClient.h +++ b/include/CefViewBrowserClient.h @@ -333,6 +333,9 @@ class CefViewBrowserClient virtual CefRefPtr GetLifeSpanHandler() override; virtual bool OnBeforePopup(CefRefPtr browser, CefRefPtr 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 index a9748b6..3063026 100644 --- a/src/CefView/CefBrowserApp/CefViewBrowserClient_LifeSpanHandler.cpp +++ b/src/CefView/CefBrowserApp/CefViewBrowserClient_LifeSpanHandler.cpp @@ -19,6 +19,9 @@ CefViewBrowserClient::GetLifeSpanHandler() bool CefViewBrowserClient::OnBeforePopup(CefRefPtr browser, CefRefPtr frame, +#if CEF_VERSION_MAJOR > 131 + int popup_id, +#endif const CefString& target_url, const CefString& target_frame_name, CefLifeSpanHandler::WindowOpenDisposition target_disposition,