aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_gpu_gpu__main.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2022-03-02 09:32:47 +0000
committerRene Ladan <rene@FreeBSD.org>2022-03-02 09:32:47 +0000
commitbfedd5f1f016c174f3fe18cd38c8517ece7b1e9b (patch)
tree1d6f8dd03169ed2d788d910cce625af1608e74d0 /www/chromium/files/patch-content_gpu_gpu__main.cc
parente18a8c4a1f1a85473f7d25dadf958405f131c81b (diff)
downloadports-bfedd5f1f016c174f3fe18cd38c8517ece7b1e9b.tar.gz
ports-bfedd5f1f016c174f3fe18cd38c8517ece7b1e9b.zip
www/chromium: update to 99.0.4844.51
On the port side, this update brings: - libvulkan enabled by default - more unit tests enabled - no longer dependent on Python 2.7 Security: https://vuxml.freebsd.org/freebsd/e0914087-9a09-11ec-9e61-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-content_gpu_gpu__main.cc')
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__main.cc42
1 files changed, 21 insertions, 21 deletions
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index 9e7739c92e9c..95666e2f0bee 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,53 +1,53 @@
---- content/gpu/gpu_main.cc.orig 2022-02-07 13:39:41 UTC
+--- content/gpu/gpu_main.cc.orig 2022-02-28 16:54:41 UTC
+++ content/gpu/gpu_main.cc
@@ -83,7 +83,7 @@
#include "sandbox/win/src/sandbox.h"
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "content/gpu/gpu_sandbox_hook_linux.h"
- #include "content/public/common/sandbox_init.h"
#include "sandbox/policy/linux/sandbox_linux.h"
-@@ -106,7 +106,7 @@ namespace content {
+ #include "sandbox/policy/sandbox_type.h"
+@@ -105,7 +105,7 @@ namespace content {
namespace {
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
bool StartSandboxLinux(gpu::GpuWatchdogThread*,
const gpu::GPUInfo*,
const gpu::GpuPreferences&);
-@@ -168,7 +168,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -167,7 +167,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) override {
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
- #elif defined(OS_WIN)
+ #elif BUILDFLAG(IS_WIN)
return StartSandboxWindows(sandbox_info_);
-@@ -264,7 +264,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -263,7 +263,7 @@ int GpuMain(MainFunctionParams parameters) {
std::make_unique<base::SingleThreadTaskExecutor>(
gpu_preferences.message_pump_type);
}
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#error "Unsupported Linux platform."
- #elif defined(OS_MAC)
+ #elif BUILDFLAG(IS_MAC)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -407,17 +407,19 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -406,17 +406,19 @@ int GpuMain(MainFunctionParams parameters) {
namespace {
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) {
TRACE_EVENT0("gpu,startup", "Initialize sandbox");
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
if (watchdog_thread) {
// SandboxLinux needs to be able to ensure that the thread
// has really been stopped.
@@ -57,11 +57,11 @@
// SandboxLinux::InitializeSandbox() must always be called
// with only one thread.
-@@ -438,11 +440,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -437,11 +439,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
*base::CommandLine::ForCurrentProcess()),
base::BindOnce(GpuProcessPreSandboxHook), sandbox_options);
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
if (watchdog_thread) {
base::Thread::Options thread_options;
thread_options.timer_slack = base::TIMER_SLACK_MAXIMUM;