diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2017-05-03 13:26:51 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2017-05-03 13:26:51 -0300 |
| commit | ad78354fdf2012d5cad519f1aeb9fd7b0baefcc5 (patch) | |
| tree | 792d95f4889a896e0233ed61b9e0c2d8396ad5be /www/chromium/files/patch-content_gpu_gpu__main.cc | |
| parent | 0ab6edbc213b13c14f547c7a3d2f638ce1061967 (diff) | |
| parent | 466d5086c13b3c5ce0297c4e8fe5158b4db0e4ef (diff) | |
| download | FreeBSD-ports-ad78354fdf2012d5cad519f1aeb9fd7b0baefcc5.zip FreeBSD-ports-ad78354fdf2012d5cad519f1aeb9fd7b0baefcc5.tar.gz | |
Merge remote-tracking branch 'origin/branches/2017Q2' into RELENG_2_3v2.3.4
Diffstat (limited to 'www/chromium/files/patch-content_gpu_gpu__main.cc')
| -rw-r--r-- | www/chromium/files/patch-content_gpu_gpu__main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index e89b5c6..accef8f 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2017-03-09 20:04:32 UTC +--- content/gpu/gpu_main.cc.orig 2017-04-19 19:06:34 UTC +++ content/gpu/gpu_main.cc -@@ -94,7 +94,7 @@ namespace content { +@@ -98,7 +98,7 @@ namespace content { namespace { @@ -9,7 +9,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*); #elif defined(OS_WIN) bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*); -@@ -148,7 +148,7 @@ class ContentSandboxHelper : public gpu: +@@ -152,7 +152,7 @@ class ContentSandboxHelper : public gpu: bool EnsureSandboxInitialized( gpu::GpuWatchdogThread* watchdog_thread) override { @@ -18,7 +18,7 @@ return StartSandboxLinux(watchdog_thread); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -310,7 +310,7 @@ int GpuMain(const MainFunctionParams& pa +@@ -313,7 +313,7 @@ int GpuMain(const MainFunctionParams& pa namespace { |
