diff options
Diffstat (limited to 'www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc')
| -rw-r--r-- | www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc | 65 |
1 files changed, 46 insertions, 19 deletions
diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index af10c34c339f..704780f0ba1c 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,56 +1,83 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2020-07-07 21:58:14 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2020-11-13 06:36:40 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -75,7 +75,7 @@ +@@ -73,7 +73,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -272,7 +272,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -129,7 +129,7 @@ + #include "extensions/browser/extension_prefs.h" // nogncheck + #endif + +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) + #include "chromecast/browser/exo/wayland_server_controller.h" + #endif + +@@ -271,7 +271,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -288,7 +288,7 @@ base::FilePath GetApplicationFontsDir() { +@@ -287,7 +287,7 @@ base::FilePath GetApplicationFontsDir() { } } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace -@@ -317,7 +317,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -316,7 +316,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -327,7 +327,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -326,7 +326,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // It's better to start GPU process on demand. For example, for TV platforms // cast starts in background and can't render until TV switches to cast // input. -@@ -479,7 +479,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -476,7 +476,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::FilePath dir_font = GetApplicationFontsDir(); const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data()); if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) { +@@ -657,7 +657,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { + cast_browser_process_->browser_context()); + #endif + +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) + wayland_server_controller_ = + std::make_unique<WaylandServerController>(window_manager_.get()); + #endif +@@ -739,7 +739,7 @@ bool CastBrowserMainParts::MainMessageLoopRun(int* res + } + + void CastBrowserMainParts::PostMainMessageLoopRun() { +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) + wayland_server_controller_.reset(); + #endif + #if BUILDFLAG(ENABLE_CHROMECAST_EXTENSIONS) |