BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 49 insertions, 28 deletions

diff --git a/chromium/content/browser/gpu/gpu_internals_ui.cc b/chromium/content/browser/gpu/gpu_internals_ui.cc
index 86ffbc43120..3a61d1573d3 100644
--- a/chromium/content/browser/gpu/gpu_internals_ui.cc
+++ b/chromium/content/browser/gpu/gpu_internals_ui.cc
@@ -47,6 +47,7 @@
 #include "gpu/config/gpu_util.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "gpu/ipc/host/gpu_memory_buffer_support.h"
+#include "services/network/public/mojom/content_security_policy.mojom.h"
 #include "skia/ext/skia_commit_hash.h"
 #include "third_party/angle/src/common/version.h"
 #include "third_party/skia/include/core/SkMilestone.h"
@@ -62,6 +63,7 @@
 #endif
 
 #if defined(USE_X11)
+#include "ui/base/ui_base_features.h"
 #include "ui/base/x/x11_util.h"       // nogncheck
 #include "ui/gfx/x/x11_atom_cache.h"  // nogncheck
 #endif
@@ -71,7 +73,8 @@ namespace {
 
 WebUIDataSource* CreateGpuHTMLSource() {
   WebUIDataSource* source = WebUIDataSource::Create(kChromeUIGpuHost);
-  source->OverrideContentSecurityPolicyScriptSrc(
+  source->OverrideContentSecurityPolicy(
+      network::mojom::CSPDirectiveName::ScriptSrc,
       "script-src chrome://resources 'self' 'unsafe-eval';");
 
   source->UseStringsJs();
@@ -136,6 +139,9 @@ std::string GPUDeviceToString(const gpu::GPUInfo::GPUDevice& gpu) {
     rt += base::StringPrintf(", SUBSYS=0x%08x, REV=%u", gpu.sub_sys_id,
                              gpu.revision);
   }
+
+  rt += base::StringPrintf(", LUID={%ld,%lu}", gpu.luid.HighPart,
+                           gpu.luid.LowPart);
 #endif
   if (gpu.active)
     rt += " *ACTIVE*";
@@ -189,6 +195,14 @@ std::unique_ptr<base::ListValue> BasicGpuInfoAsListValue(
   basic_info->Append(NewDescriptionValuePair(
       "NV12 overlay support",
       gpu::OverlaySupportToString(gpu_info.overlay_info.nv12_overlay_support)));
+  basic_info->Append(NewDescriptionValuePair(
+      "BGRA8 overlay support",
+      gpu::OverlaySupportToString(
+          gpu_info.overlay_info.bgra8_overlay_support)));
+  basic_info->Append(NewDescriptionValuePair(
+      "RGB10A2 overlay support",
+      gpu::OverlaySupportToString(
+          gpu_info.overlay_info.rgb10a2_overlay_support)));
 
   std::vector<gfx::PhysicalDisplaySize> display_sizes =
       gfx::GetPhysicalSizeForDisplays();
@@ -207,13 +221,11 @@ std::unique_ptr<base::ListValue> BasicGpuInfoAsListValue(
 
   basic_info->Append(NewDescriptionValuePair(
       "Driver D3D12 feature level",
-      gpu::D3DFeatureLevelToString(
-          gpu_info.dx12_vulkan_version_info.d3d12_feature_level)));
+      gpu::D3DFeatureLevelToString(gpu_info.d3d12_feature_level)));
 
   basic_info->Append(NewDescriptionValuePair(
       "Driver Vulkan API version",
-      gpu::VulkanVersionToString(
-          gpu_info.dx12_vulkan_version_info.vulkan_version)));
+      gpu::VulkanVersionToString(gpu_info.vulkan_version)));
 #endif
 
   basic_info->Append(
@@ -251,25 +263,29 @@ std::unique_ptr<base::ListValue> BasicGpuInfoAsListValue(
   basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
                                              gpu_info.gl_ws_extensions));
 #if defined(USE_X11)
-  basic_info->Append(
-      NewDescriptionValuePair("Window manager", ui::GuessWindowManagerName()));
-  {
-    std::unique_ptr<base::Environment> env(base::Environment::Create());
-    std::string value;
-    const char kXDGCurrentDesktop[] = "XDG_CURRENT_DESKTOP";
-    if (env->GetVar(kXDGCurrentDesktop, &value))
-      basic_info->Append(NewDescriptionValuePair(kXDGCurrentDesktop, value));
-    const char kGDMSession[] = "GDMSESSION";
-    if (env->GetVar(kGDMSession, &value))
-      basic_info->Append(NewDescriptionValuePair(kGDMSession, value));
+  // TODO(https://crbug.com/1097007): capture window manager name on Ozone.
+  if (!features::IsUsingOzonePlatform()) {
+    basic_info->Append(NewDescriptionValuePair("Window manager",
+                                               ui::GuessWindowManagerName()));
+    {
+      std::unique_ptr<base::Environment> env(base::Environment::Create());
+      std::string value;
+      const char kXDGCurrentDesktop[] = "XDG_CURRENT_DESKTOP";
+      if (env->GetVar(kXDGCurrentDesktop, &value))
+        basic_info->Append(NewDescriptionValuePair(kXDGCurrentDesktop, value));
+      const char kGDMSession[] = "GDMSESSION";
+      if (env->GetVar(kGDMSession, &value))
+        basic_info->Append(NewDescriptionValuePair(kGDMSession, value));
+      basic_info->Append(NewDescriptionValuePair(
+          "Compositing manager",
+          ui::IsCompositingManagerPresent() ? "Yes" : "No"));
+    }
     basic_info->Append(NewDescriptionValuePair(
-        "Compositing manager",
-        ui::IsCompositingManagerPresent() ? "Yes" : "No"));
+        "System visual ID",
+        base::NumberToString(gpu_extra_info.system_visual)));
+    basic_info->Append(NewDescriptionValuePair(
+        "RGBA visual ID", base::NumberToString(gpu_extra_info.rgba_visual)));
   }
-  basic_info->Append(NewDescriptionValuePair(
-      "System visual ID", base::NumberToString(gpu_extra_info.system_visual)));
-  basic_info->Append(NewDescriptionValuePair(
-      "RGBA visual ID", base::NumberToString(gpu_extra_info.rgba_visual)));
 #endif
   std::string direct_rendering_version;
   if (gpu_info.direct_rendering_version == "1") {
@@ -361,13 +377,18 @@ std::unique_ptr<base::ListValue> GpuMemoryBufferInfo(
 
   gpu::GpuMemoryBufferSupport gpu_memory_buffer_support;
 
+  gpu::GpuMemoryBufferConfigurationSet native_config;
 #if defined(USE_X11)
-  const auto& native_configurations =
-      gpu_extra_info.gpu_memory_buffer_support_x11;
-#else
-  const auto native_configurations =
-      gpu::GetNativeGpuMemoryBufferConfigurations(&gpu_memory_buffer_support);
+  if (features::IsUsingOzonePlatform()) {
+    for (const auto& config : gpu_extra_info.gpu_memory_buffer_support_x11) {
+      native_config.emplace(config);
+    }
+  }
 #endif
+  if (native_config.empty()) {
+    native_config =
+        gpu::GetNativeGpuMemoryBufferConfigurations(&gpu_memory_buffer_support);
+  }
   for (size_t format = 0;
        format < static_cast<size_t>(gfx::BufferFormat::LAST) + 1; format++) {
     std::string native_usage_support;
@@ -375,7 +396,7 @@ std::unique_ptr<base::ListValue> GpuMemoryBufferInfo(
          usage < static_cast<size_t>(gfx::BufferUsage::LAST) + 1; usage++) {
       gfx::BufferUsageAndFormat element{static_cast<gfx::BufferUsage>(usage),
                                         static_cast<gfx::BufferFormat>(format)};
-      if (base::Contains(native_configurations, element)) {
+      if (base::Contains(native_config, element)) {
         native_usage_support = base::StringPrintf(
             "%s%s %s", native_usage_support.c_str(),
             native_usage_support.empty() ? "" : ",",