1 files changed, 25 insertions, 16 deletions

diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
index c64b927b3136..c0ca3352609e 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -1,34 +1,43 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2016-05-11 19:02:20 UTC
-+++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -486,8 +486,10 @@ void GpuDataManagerImplPrivate::SetGLStr
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2016-10-06 04:02:18.000000000 +0300
++++ content/browser/gpu/gpu_data_manager_impl_private.cc	2016-10-14 17:58:04.977933000 +0300
+@@ -363,7 +363,7 @@
+     // strings even if all features are blacklisted. If all GPU features are
+     // disabled, the GPU process will only initialize GL bindings, create a GL
+     // context, and collect full GPU info.
+-#if !defined(OS_LINUX)
++#if !defined(OS_LINUX) || !defined(OS_BSD)
+     if (reason) {
+       *reason = "All GPU features are blacklisted.";
+     }
+@@ -486,8 +486,10 @@
    gpu_info.gl_renderer = gl_renderer;
    gpu_info.gl_version = gl_version;
  
-+#if !defined(OS_FREEBSD)
++#if !defined(OS_BSD)
    gpu::IdentifyActiveGPU(&gpu_info);
    gpu::CollectDriverInfoGL(&gpu_info);
 +#endif
  
    UpdateGpuInfo(gpu_info);
    UpdateGpuSwitchingManager(gpu_info);
-@@ -529,10 +531,12 @@ void GpuDataManagerImplPrivate::Initiali
-     // Also declare the driver_vendor to be osmesa to be able to specify
-     // exceptions based on driver_vendor==osmesa for some blacklist rules.
-     gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName;
-+#ifndef __FreeBSD__
-   } else {
-     TRACE_EVENT0("startup",
-       "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo");
-     gpu::CollectBasicGraphicsInfo(&gpu_info);
+@@ -542,10 +544,12 @@
+     // Skip collecting the basic driver info if SetGpuInfo() is already called.
+     if (IsCompleteGpuInfoAvailable()) {
+       gpu_info = gpu_info_;
++#ifndef OS_BSD
+     } else {
+       TRACE_EVENT0("startup",
+                    "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo");
+       gpu::CollectBasicGraphicsInfo(&gpu_info);
 +#endif
+     }
  
      if (command_line->HasSwitch(switches::kGpuTestingVendorId) &&
-         command_line->HasSwitch(switches::kGpuTestingDeviceId)) {
-@@ -631,7 +635,9 @@ void GpuDataManagerImplPrivate::UpdateGp
+@@ -657,7 +661,9 @@
      return;
  
    bool was_info_available = IsCompleteGpuInfoAvailable();
-+#ifndef __FreeBSD__
++#ifndef OS_BSD
    gpu::MergeGPUInfo(&gpu_info_, gpu_info);
 +#endif
    if (IsCompleteGpuInfoAvailable()) {