diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-01-16 20:59:10 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-01-16 20:59:10 +0000 |
| commit | b1f54f0fc1fb0cc165a0576e0903efc1ea241ef3 (patch) | |
| tree | de284d6e6fac9a05189b48ba453d2e271bbb5e30 /www/chromium/files/patch-content_gpu_gpu__main.cc | |
| parent | databases/py-asyncpg: Update to 0.20.1 (diff) | |
www/chromium: update to 79.0.3945.117
Submitted by: Matthias Wolf via GitHub
Pull requests: 169, 170
MFH: 2019Q2 (browser, security)
Diffstat (limited to 'www/chromium/files/patch-content_gpu_gpu__main.cc')
| -rw-r--r-- | www/chromium/files/patch-content_gpu_gpu__main.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 09c0f351a188..7a516f808bc5 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2019-10-21 19:06:32 UTC +--- content/gpu/gpu_main.cc.orig 2019-12-16 21:51:26 UTC +++ content/gpu/gpu_main.cc @@ -82,7 +82,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "services/service_manager/sandbox/linux/sandbox_linux.h" -@@ -111,7 +111,7 @@ namespace content { +@@ -103,7 +103,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -164,7 +164,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -276,7 +276,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -268,7 +268,7 @@ int GpuMain(const MainFunctionParams& parameters) { main_thread_task_executor = std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif defined(OS_MACOSX) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -383,7 +383,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -372,7 +372,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -45,7 +45,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -418,7 +418,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -407,7 +407,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } |