aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-services_ui_gpu_gpu__service.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-services_ui_gpu_gpu__service.cc')
-rw-r--r--www/chromium/files/patch-services_ui_gpu_gpu__service.cc29
1 files changed, 29 insertions, 0 deletions
diff --git a/www/chromium/files/patch-services_ui_gpu_gpu__service.cc b/www/chromium/files/patch-services_ui_gpu_gpu__service.cc
new file mode 100644
index 000000000000..791f589920b1
--- /dev/null
+++ b/www/chromium/files/patch-services_ui_gpu_gpu__service.cc
@@ -0,0 +1,29 @@
+--- services/ui/gpu/gpu_service.cc.orig 2017-06-05 19:03:11 UTC
++++ services/ui/gpu/gpu_service.cc
+@@ -269,7 +269,7 @@ void GpuService::RequestCompleteGpuInfo(
+ }
+ UpdateGpuInfoPlatform();
+ callback.Run(gpu_info_);
+-#if defined(OS_WIN)
++#if defined(OS_WIN) && !defined(OS_BSD)
+ if (!in_host_process_) {
+ // The unsandboxed GPU process fulfilled its duty. Rest in peace.
+ base::MessageLoop::current()->QuitWhenIdle();
+@@ -305,7 +305,7 @@ void GpuService::UpdateGpuInfoPlatform() {
+ }
+ gpu::SetKeysForCrashLogging(gpu_info_);
+ }
+-#elif defined(OS_WIN)
++#elif defined(OS_WIN) && !defined(OS_BSD)
+ void GpuService::UpdateGpuInfoPlatform() {
+ DCHECK(main_runner_->BelongsToCurrentThread());
+ // GPU full info collection should only happen on un-sandboxed GPU process
+@@ -353,7 +353,7 @@ void GpuService::StoreShaderToDisk(int client_id,
+ (*gpu_host_)->StoreShaderToDisk(client_id, key, shader);
+ }
+
+-#if defined(OS_WIN)
++#if defined(OS_WIN) && !defined(OS_BSD)
+ void GpuService::SendAcceleratedSurfaceCreatedChildWindow(
+ gpu::SurfaceHandle parent_window,
+ gpu::SurfaceHandle child_window) {