Enable building with CEF 6261

This allows compiling OBS Browser with Chromium 122-based CEF versions. Note this does not Sources: - https://github.com/chromiumembedded/cef/blame/d3a483ef59f8f40c624967361e05edda413bbf5b/libcef_dll/ctocpp/browser_ctocpp.h#L57 - https://bitbucket.org/chromiumembedded/cef/commits/f3b570c
obsproject · Feb 4, 2024 · b8838ad · b8838ad
1 parent 58c7365
commit b8838ad
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/browser-app.cpp b/browser-app.cpp
@@ -147,7 +147,12 @@ void BrowserApp::ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
  std::vector<CefString> names;
  browser->GetFrameNames(names);
  for (auto &name : names) {
- CefRefPtr<CefFrame> frame = browser->GetFrame(name);
+ CefRefPtr<CefFrame> frame =
+#if CHROME_VERSION_BUILD >= 6261
+ browser->GetFrameByName(name);
+#else
+ browser->GetFrame(name);
+#endif
  CefRefPtr<CefV8Context> context = frame->GetV8Context();
 
  context->Enter();
@@ -346,7 +351,12 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
  std::vector<CefString> names;
  browser->GetFrameNames(names);
  for (auto &name : names) {
- CefRefPtr<CefFrame> frame = browser->GetFrame(name);
+ CefRefPtr<CefFrame> frame =
+#if CHROME_VERSION_BUILD >= 6261
+ browser->GetFrameByName(name);
+#else
+ browser->GetFrame(name);
+#endif
  CefRefPtr<CefV8Context> context = frame->GetV8Context();
 
  context->Enter();

diff --git a/obs-browser-page/obs-browser-page-main.cpp b/obs-browser-page/obs-browser-page-main.cpp
@@ -79,8 +79,10 @@ int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
  std::thread shutdown_check;
 
  CefMainArgs mainArgs(nullptr);
+#if CHROME_VERSION_BUILD < 5615
  if (!SetHighDPIv2Scaling())
  CefEnableHighDPISupport();
+#endif
 
  CefRefPtr<CefCommandLine> command_line =
  CefCommandLine::CreateCommandLine();

diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp
@@ -748,9 +748,12 @@ bool obs_module_load(void)
 
  os_event_init(&cef_started_event, OS_EVENT_TYPE_MANUAL);
 
-#ifdef _WIN32
+#if defined(_WIN32) && CHROME_VERSION_BUILD < 5615
  /* CefEnableHighDPISupport doesn't do anything on OS other than Windows. Would also crash macOS at this point as CEF is not directly linked */
  CefEnableHighDPISupport();
+#endif
+
+#ifdef _WIN32
  EnumAdapterCount();
 #else
 #if defined(__APPLE__) && !defined(ENABLE_BROWSER_LEGACY)