www/chromium: Update to version 85.0.4183.121

Submitted by:	cem, rene
Obtained from:	some patches from OpenBSD port

1 files changed, 21 insertions, 21 deletions

diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index f33260dc9b3e..48e886d75137 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_init.cc.orig	2020-07-07 21:58:16 UTC
+--- gpu/ipc/service/gpu_init.cc.orig	2020-09-08 19:14:06 UTC
 +++ gpu/ipc/service/gpu_init.cc
-@@ -92,7 +92,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
+@@ -94,7 +94,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
  #endif
  }
  
@@ -9,7 +9,7 @@
  bool CanAccessNvidiaDeviceFile() {
    bool res = true;
    base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-@@ -103,7 +103,7 @@ bool CanAccessNvidiaDeviceFile() {
+@@ -105,7 +105,7 @@ bool CanAccessNvidiaDeviceFile() {
    }
    return res;
  }
@@ -18,7 +18,7 @@
  
  class GpuWatchdogInit {
   public:
-@@ -160,7 +160,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -178,7 +178,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
      device_perf_info_ = device_perf_info;
    }
  
@@ -27,7 +27,7 @@
    if (gpu_info_.gpu.vendor_id == 0x10de &&  // NVIDIA
        gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
      return false;
-@@ -212,7 +212,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -230,7 +230,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    delayed_watchdog_enable = true;
  #endif
  
@@ -36,7 +36,7 @@
    // PreSandbox is mainly for resource handling and not related to the GPU
    // driver, it doesn't need the GPU watchdog. The loadLibrary may take long
    // time that killing and restarting the GPU process will not help.
-@@ -257,7 +257,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -275,7 +275,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
  
    bool attempted_startsandbox = false;
@@ -45,7 +45,7 @@
    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
    // initializing a GL context, so start the sandbox early.
    // TODO(zmo): Need to collect OS version before this.
-@@ -266,7 +266,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -284,7 +284,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
          watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
      attempted_startsandbox = true;
    }
@@ -54,9 +54,9 @@
  
    base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
  
-@@ -289,14 +289,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -307,14 +307,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
-   if (gl_initialized && use_swiftshader &&
+   if (gl_initialized && gl_use_swiftshader_ &&
        gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
@@ -71,34 +71,34 @@
    }
  
    if (!gl_initialized) {
-@@ -322,7 +322,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -340,7 +340,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
      }
    }
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) && !defined(OS_BSD)
    // The ContentSandboxHelper is currently the only one implementation of
-   // gpu::GpuSandboxHelper and it has no dependency. Except on Linux where
+   // GpuSandboxHelper and it has no dependency. Except on Linux where
    // VaapiWrapper checks the GL implementation to determine which display
-@@ -373,7 +373,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -392,7 +392,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
            command_line, gpu_feature_info_,
            gpu_preferences_.disable_software_rasterizer, false);
-       if (use_swiftshader) {
+       if (gl_use_swiftshader_) {
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
          VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                  << "on Linux";
          return false;
-@@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -406,7 +406,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
                << "failed";
            return false;
          }
 -#endif  // OS_LINUX
 +#endif  // OS_LINUX || OS_BSD
        }
-     } else {  // use_swiftshader == true
+     } else {  // gl_use_swiftshader_ == true
        switch (gpu_preferences_.use_vulkan) {
-@@ -443,7 +443,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -482,7 +482,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
  
    InitializePlatformOverlaySettings(&gpu_info_);
  
@@ -107,16 +107,16 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -462,7 +462,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -501,7 +501,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
        return false;
      }
    }
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  
-   if (use_swiftshader) {
+   if (gl_use_swiftshader_) {
      AdjustInfoToSwiftShader();
-@@ -628,7 +628,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -667,7 +667,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
  
    InitializePlatformOverlaySettings(&gpu_info_);
  
@@ -125,12 +125,12 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -648,7 +648,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -687,7 +687,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
        }
      }
    }
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  
-   if (use_swiftshader) {
+   if (gl_use_swiftshader_) {
      AdjustInfoToSwiftShader();