Enable building with CEF 6533 & 6613

Chromium 128 removes the `persist_user_preferences` setting entirely. Chrome runtime is used by default, so to disable 'Cast..' and more, explicitly use the Alloy runtime. DevTools popups can no longer be windowless.
obsproject · Aug 1, 2024 · d18fc7a · d18fc7a
1 parent 75d3eb1
commit d18fc7a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp
@@ -366,7 +366,9 @@ static void BrowserInit(void)
 	BPtr<char> conf_path_abs = os_get_abs_path_ptr(conf_path);
 	CefString(&settings.locale) = obs_get_locale();
 	CefString(&settings.accept_language_list) = accepted_languages;
+#if CHROME_VERSION_BUILD <= 6533
 	settings.persist_user_preferences = 1;
+#endif
 	CefString(&settings.cache_path) = conf_path_abs;
 #if !defined(__APPLE__) || defined(ENABLE_BROWSER_LEGACY)
 	char *abs_path = os_get_abs_path_ptr(path.c_str());

diff --git a/panel/browser-panel-client.cpp b/panel/browser-panel-client.cpp
@@ -348,7 +348,7 @@ bool QCefBrowserClient::OnContextMenuCommand(
 	QString title;
 	switch (command_id) {
 	case MENU_ITEM_DEVTOOLS:
-#if defined(_WIN32)
+#if defined(_WIN32) && CHROME_VERSION_BUILD < 6533
 		title = QString(obs_module_text("DevTools"))
 				.arg(widget->parentWidget()->windowTitle());
 		windowInfo.SetAsPopup(host->GetWindowHandle(),

diff --git a/panel/browser-panel.cpp b/panel/browser-panel.cpp
@@ -84,7 +84,9 @@ struct QCefCookieManagerInternal : QCefCookieManager {
 		BPtr<char> path = os_get_abs_path_ptr(rpath.Get());
 
 		CefRequestContextSettings settings;
+#if CHROME_VERSION_BUILD <= 6533
 		settings.persist_user_preferences = 1;
+#endif
 		CefString(&settings.cache_path) = path.Get();
 		rc = CefRequestContext::CreateContext(
 			settings, CefRefPtr<CefRequestContextHandler>());
@@ -107,7 +109,9 @@ struct QCefCookieManagerInternal : QCefCookieManager {
 		BPtr<char> path = os_get_abs_path_ptr(rpath.Get());
 
 		CefRequestContextSettings settings;
+#if CHROME_VERSION_BUILD <= 6533
 		settings.persist_user_preferences = 1;
+#endif
 		CefString(&settings.cache_path) = storage_path;
 		rc = CefRequestContext::CreateContext(
 			settings, CefRefPtr<CefRequestContextHandler>());
@@ -314,6 +318,10 @@ void QCefWidgetInternal::Init()
 			QSize size = this->size();
 #endif
 
+#if CHROME_VERSION_BUILD >= 6533
+			windowInfo.runtime_style = CEF_RUNTIME_STYLE_ALLOY;
+#endif
+
 #if CHROME_VERSION_BUILD < 4430
 #ifdef __APPLE__
 			windowInfo.SetAsChild((CefWindowHandle)handle, 0, 0,