BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 25 insertions, 4 deletions

diff --git a/chromium/gpu/ipc/common/BUILD.gn b/chromium/gpu/ipc/common/BUILD.gn
index a8f3c602db5..51c88a3817c 100644
--- a/chromium/gpu/ipc/common/BUILD.gn
+++ b/chromium/gpu/ipc/common/BUILD.gn
@@ -214,6 +214,10 @@ mojom("interfaces") {
     "vulkan_ycbcr_info.mojom",
   ]
 
+  if (is_win) {
+    sources += [ "luid.mojom" ]
+  }
+
   public_deps = [
     ":gpu_preferences_interface",
     "//mojo/public/mojom/base",
@@ -269,6 +273,24 @@ mojom("interfaces") {
     },
   ]
 
+  if (is_win) {
+    shared_cpp_typemaps += [
+      {
+        types = [
+          {
+            mojom = "gpu.mojom.Luid"
+            cpp = "::LUID"
+          },
+        ]
+        traits_headers = [ "luid_mojom_traits.h" ]
+        traits_public_deps = [
+          ":mojom_traits",
+          "//gpu/config",
+        ]
+      },
+    ]
+  }
+
   cpp_typemaps = shared_cpp_typemaps
   blink_cpp_typemaps = shared_cpp_typemaps
 
@@ -364,10 +386,6 @@ mojom("interfaces") {
           cpp = "::gpu::CollectInfoResult"
         },
         {
-          mojom = "gpu.mojom.Dx12VulkanVersionInfo"
-          cpp = "::gpu::Dx12VulkanVersionInfo"
-        },
-        {
           mojom = "gpu.mojom.OverlayInfo"
           cpp = "::gpu::OverlayInfo"
         },
@@ -580,6 +598,9 @@ source_set("mojom_traits") {
   if (is_android) {
     sources += [ "vulkan_ycbcr_info_mojom_traits.h" ]
   }
+  if (is_win) {
+    sources += [ "luid_mojom_traits.h" ]
+  }
   if (enable_vulkan) {
     deps += [ ":vulkan_types_mojom_traits" ]
   }