BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 19 insertions, 2 deletions

diff --git a/chromium/gpu/command_buffer/common/BUILD.gn b/chromium/gpu/command_buffer/common/BUILD.gn
index bcf81ea98b9..9696af1c3a3 100644
--- a/chromium/gpu/command_buffer/common/BUILD.gn
+++ b/chromium/gpu/command_buffer/common/BUILD.gn
@@ -34,6 +34,14 @@ group("raster") {
   }
 }
 
+group("mailbox") {
+  if (is_component_build) {
+    public_deps = [ "//gpu:mailbox" ]
+  } else {
+    public_deps = [ ":mailbox_sources" ]
+  }
+}
+
 group("webgpu") {
   public_deps = [ ":webgpu_sources" ]
 }
@@ -68,8 +76,6 @@ jumbo_source_set("common_sources") {
     "gpu_memory_buffer_support.h",
     "id_allocator.cc",
     "id_allocator.h",
-    "mailbox.cc",
-    "mailbox.h",
     "mailbox_holder.cc",
     "mailbox_holder.h",
     "presentation_feedback_utils.cc",
@@ -92,6 +98,7 @@ jumbo_source_set("common_sources") {
   configs += [ "//gpu:gpu_implementation" ]
 
   public_deps = [
+    ":mailbox",
     "//base/util/type_safety",
     "//mojo/public/cpp/system",
     "//ui/gfx:memory_buffer",
@@ -105,6 +112,16 @@ jumbo_source_set("common_sources") {
   configs += [ "//third_party/khronos:khronos_headers" ]
 }
 
+source_set("mailbox_sources") {
+  visibility = [ "//gpu/*" ]
+  defines = [ "IS_GPU_MAILBOX_IMPL" ]
+  sources = [
+    "mailbox.cc",
+    "mailbox.h",
+  ]
+  deps = [ "//base" ]
+}
+
 source_set("gles2_sources") {
   visibility = [ "//gpu/*" ]