BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 26 insertions, 3 deletions

diff --git a/chromium/components/viz/service/BUILD.gn b/chromium/components/viz/service/BUILD.gn
index b2ba22d8da6..09797704091 100644
--- a/chromium/components/viz/service/BUILD.gn
+++ b/chromium/components/viz/service/BUILD.gn
@@ -330,6 +330,10 @@ viz_source_set("gpu_service_dependencies") {
   sources = [
     "display_embedder/image_context_impl.cc",
     "display_embedder/image_context_impl.h",
+    "display_embedder/output_presenter.cc",
+    "display_embedder/output_presenter.h",
+    "display_embedder/output_presenter_gl.cc",
+    "display_embedder/output_presenter_gl.h",
     "display_embedder/skia_output_device.cc",
     "display_embedder/skia_output_device.h",
     "display_embedder/skia_output_device_buffer_queue.cc",
@@ -365,7 +369,10 @@ viz_source_set("gpu_service_dependencies") {
 
   defines = [ "VIZ_SERVICE_IMPLEMENTATION" ]
 
-  deps = [ "//gpu/config" ]
+  deps = [
+    "//base",
+    "//gpu/config",
+  ]
 
   if (is_win) {
     sources += [
@@ -409,7 +416,7 @@ viz_source_set("gpu_service_dependencies") {
     deps += [ "//ui/gfx/x" ]
   }
 
-  if (skia_use_dawn) {
+  if (skia_use_dawn && is_win) {
     sources += [
       "display_embedder/skia_output_device_dawn.cc",
       "display_embedder/skia_output_device_dawn.h",
@@ -423,6 +430,19 @@ viz_source_set("gpu_service_dependencies") {
       "//third_party/dawn/src/dawn_native",
     ]
   }
+
+  if (is_fuchsia) {
+    sources += [
+      "display_embedder/output_presenter_fuchsia.cc",
+      "display_embedder/output_presenter_fuchsia.h",
+    ]
+
+    deps += [
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.images",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sysmem",
+      "//third_party/fuchsia-sdk/sdk/pkg/sys_inspect_cpp",
+    ]
+  }
 }
 
 viz_source_set("unit_tests") {
@@ -491,6 +511,7 @@ viz_source_set("unit_tests") {
     "//components/viz/common",
     "//components/viz/host",
     "//components/viz/service/main:main",
+    "//components/viz/test:test_suite",
     "//components/viz/test:test_support",
     "//gpu/command_buffer/client",
     "//gpu/command_buffer/client:gles2_implementation",
@@ -554,7 +575,9 @@ viz_source_set("unit_tests") {
     # TODO(samans): Support more configurations.
     # CFI issue: https://crbug.com/967819
     # LSAN issue: https://crbug.com/971357
-    if (use_x11 && !is_cfi && !is_lsan) {
+    # Fuchsia ARM64 https://crbug.com/1058247
+    if ((use_x11 && !is_cfi && !is_lsan) ||
+        (is_fuchsia && target_cpu == "x64")) {
       defines += [ "ENABLE_VIZ_VULKAN_TESTS" ]
     }
   }