From cda47aaff4d3c5156e8ae271a14a6bbd78fb95f9 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 10 Mar 2025 11:52:56 -0400 Subject: [PATCH] Tag 13401 API version --- cef_api_versions.json | 8 +++++++- include/cef_preference.h | 14 +++++++------- include/cef_request_context.h | 8 ++++---- libcef/browser/global_preference_manager_impl.cc | 6 +++--- libcef/browser/request_context_impl.cc | 4 ++-- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/cef_api_versions.json b/cef_api_versions.json index 4c99122ae..fc45c0007 100644 --- a/cef_api_versions.json +++ b/cef_api_versions.json @@ -35,8 +35,14 @@ "linux": "ea2106b5bc012c25d735521e0c7fb719d433ea4a", "mac": "ba5ab71db4f9447f19eb7b1943024981c88064dd", "windows": "6ab74b90e88b7397aab9911baac5484f12466eef" + }, + "13401": { + "comment": "Added March 10, 2025.", + "linux": "b14bee2c0fd250da67faea421f620b58e5dea9a2", + "mac": "b54732b528bc2669481ec0cf17c7b97b033720b9", + "windows": "751255204f006b8b883a8baf552a2da792f8aa44" } }, - "last": "13400", + "last": "13401", "min": "13300" } \ No newline at end of file diff --git a/include/cef_preference.h b/include/cef_preference.h index 348b6320b..c4793eb7f 100644 --- a/include/cef_preference.h +++ b/include/cef_preference.h @@ -66,13 +66,13 @@ class CefPreferenceRegistrar : public CefBaseScoped { CefRefPtr default_value) = 0; }; -#if CEF_API_ADDED(CEF_NEXT) +#if CEF_API_ADDED(13401) /// /// Implemented by the client to observe preference changes and registered via /// CefPreferenceManager::AddPreferenceObserver. The methods of this class will /// be called on the browser process UI thread. /// -/*--cef(source=client,added=next)--*/ +/*--cef(source=client,added=13401)--*/ class CefPreferenceObserver : public virtual CefBaseRefCounted { public: /// @@ -92,7 +92,7 @@ class CefPreferenceObserver : public virtual CefBaseRefCounted { /*--cef(source=library,no_debugct_check)--*/ class CefPreferenceManager : public virtual CefBaseRefCounted { public: -#if CEF_API_ADDED(CEF_NEXT) +#if CEF_API_ADDED(13401) /// /// Returns the current Chrome Variations configuration (combination of field /// trials and chrome://flags) as equivalent command-line switches @@ -104,7 +104,7 @@ class CefPreferenceManager : public virtual CefBaseRefCounted { /// `disable_fieldtrial_testing_config=true` GN flag). This method must be /// called on the browser process UI thread. /// - /*--cef(added=next)--*/ + /*--cef(added=13401)--*/ static void GetChromeVariationsAsSwitches(std::vector& switches); /// @@ -118,7 +118,7 @@ class CefPreferenceManager : public virtual CefBaseRefCounted { /// `disable_fieldtrial_testing_config=true` GN flag). This method must be /// called on the browser process UI thread. /// - /*--cef(added=next)--*/ + /*--cef(added=13401)--*/ static void GetChromeVariationsAsStrings(std::vector& strings); #endif @@ -179,7 +179,7 @@ class CefPreferenceManager : public virtual CefBaseRefCounted { CefRefPtr value, CefString& error) = 0; -#if CEF_API_ADDED(CEF_NEXT) +#if CEF_API_ADDED(13401) /// /// Add an observer for preference changes. |name| is the name of the /// preference to observe. If |name| is empty then all preferences will @@ -188,7 +188,7 @@ class CefPreferenceManager : public virtual CefBaseRefCounted { /// registered until the returned Registration object is destroyed. This /// method must be called on the browser process UI thread. /// - /*--cef(optional_param=name,added=next)--*/ + /*--cef(optional_param=name,added=13401)--*/ virtual CefRefPtr AddPreferenceObserver( const CefString& name, CefRefPtr observer) = 0; diff --git a/include/cef_request_context.h b/include/cef_request_context.h index 406649702..8e27d49d7 100644 --- a/include/cef_request_context.h +++ b/include/cef_request_context.h @@ -67,13 +67,13 @@ class CefResolveCallback : public virtual CefBaseRefCounted { const std::vector& resolved_ips) = 0; }; -#if CEF_API_ADDED(CEF_NEXT) +#if CEF_API_ADDED(13401) /// /// Implemented by the client to observe content and website setting changes and /// registered via CefRequestContext::AddSettingObserver. The methods of this /// class will be called on the browser process UI thread. /// -/*--cef(source=client,added=next)--*/ +/*--cef(source=client,added=13401)--*/ class CefSettingObserver : public virtual CefBaseRefCounted { public: /// @@ -314,13 +314,13 @@ class CefRequestContext : public CefPreferenceManager { cef_content_setting_types_t content_type, cef_content_setting_values_t value) = 0; -#if CEF_API_ADDED(CEF_NEXT) +#if CEF_API_ADDED(13401) /// /// Add an observer for content and website setting changes. The observer will /// remain registered until the returned Registration object is destroyed. /// This method must be called on the browser process UI thread. /// - /*--cef(added=next)--*/ + /*--cef(added=13401)--*/ virtual CefRefPtr AddSettingObserver( CefRefPtr observer) = 0; #endif diff --git a/libcef/browser/global_preference_manager_impl.cc b/libcef/browser/global_preference_manager_impl.cc index 1a3a0a18f..50e2ceca8 100644 --- a/libcef/browser/global_preference_manager_impl.cc +++ b/libcef/browser/global_preference_manager_impl.cc @@ -62,7 +62,7 @@ CefRefPtr CefGlobalPreferenceManagerImpl::AddPreferenceObserver( const CefString& name, CefRefPtr observer) { - CEF_API_REQUIRE_ADDED(CEF_NEXT); + CEF_API_REQUIRE_ADDED(13401); CEF_REQUIRE_UIT_RETURN(nullptr); return CefContext::Get()->GetPrefRegistrar()->AddObserver(name, observer); } @@ -70,7 +70,7 @@ CefGlobalPreferenceManagerImpl::AddPreferenceObserver( // static void CefPreferenceManager::GetChromeVariationsAsSwitches( std::vector& switches) { - CEF_API_REQUIRE_ADDED(CEF_NEXT); + CEF_API_REQUIRE_ADDED(13401); // Verify that the context is in a valid state. if (!CONTEXT_STATE_VALID()) { @@ -98,7 +98,7 @@ void CefPreferenceManager::GetChromeVariationsAsSwitches( // static void CefPreferenceManager::GetChromeVariationsAsStrings( std::vector& strings) { - CEF_API_REQUIRE_ADDED(CEF_NEXT); + CEF_API_REQUIRE_ADDED(13401); // Verify that the context is in a valid state. if (!CONTEXT_STATE_VALID()) { diff --git a/libcef/browser/request_context_impl.cc b/libcef/browser/request_context_impl.cc index 1a8f43b15..452388149 100644 --- a/libcef/browser/request_context_impl.cc +++ b/libcef/browser/request_context_impl.cc @@ -464,7 +464,7 @@ bool CefRequestContextImpl::SetPreference(const CefString& name, CefRefPtr CefRequestContextImpl::AddPreferenceObserver( const CefString& name, CefRefPtr observer) { - CEF_API_REQUIRE_ADDED(CEF_NEXT); + CEF_API_REQUIRE_ADDED(13401); if (!VerifyBrowserContext()) { return nullptr; } @@ -608,7 +608,7 @@ void CefRequestContextImpl::SetContentSetting( CefRefPtr CefRequestContextImpl::AddSettingObserver( CefRefPtr observer) { - CEF_API_REQUIRE_ADDED(CEF_NEXT); + CEF_API_REQUIRE_ADDED(13401); if (!VerifyBrowserContext()) { return nullptr; }