BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 47 insertions, 4 deletions

diff --git a/chromium/skia/BUILD.gn b/chromium/skia/BUILD.gn
index 7015ef36ec6..cbdf2c52e77 100644
--- a/chromium/skia/BUILD.gn
+++ b/chromium/skia/BUILD.gn
@@ -13,6 +13,7 @@ import("//testing/test.gni")
 import("//third_party/libgifcodec/libgifcodec.gni")
 import("//third_party/skia/gn/shared_sources.gni")
 import("//third_party/skia/third_party/skcms/skcms.gni")
+import("//tools/grit/grit_rule.gni")
 import("features.gni")
 
 if (current_cpu == "arm") {
@@ -39,10 +40,12 @@ buildflag_header("buildflags") {
 
 # External-facing config for dependent code.
 config("skia_config") {
+  defines = []
   include_dirs = [ "//third_party/skia" ]
 
   if (!is_ios) {
     if (enable_skia_wuffs_gif) {
+      defines += [ "SK_FAVOR_WUFFS_V_0_3_OVER_V_0_2" ]
       include_dirs += [ "//third_party/wuffs/src/release/c" ]
     } else {
       include_dirs += [ "//third_party/libgifcodec" ]
@@ -53,7 +56,7 @@ config("skia_config") {
     configs = [ "//third_party/vulkan_headers:vulkan_headers_config" ]
   }
 
-  defines = [
+  defines += [
     "SK_CODEC_DECODES_PNG",
     "SK_CODEC_DECODES_WEBP",
     "SK_ENCODE_PNG",
@@ -433,8 +436,13 @@ component("skia") {
   if (is_mac || is_ios) {
     set_sources_assignment_filter([])
     sources += [
-      "//third_party/skia/src/ports/SkFontHost_mac.cpp",
-      "//third_party/skia/src/utils/mac/SkStream_mac.cpp",
+      "//third_party/skia/include/ports/SkFontMgr_mac_ct.h",
+      "//third_party/skia/src/ports/SkFontMgr_mac_ct.cpp",
+      "//third_party/skia/src/ports/SkFontMgr_mac_ct_factory.cpp",
+      "//third_party/skia/src/ports/SkScalerContext_mac_ct.cpp",
+      "//third_party/skia/src/ports/SkScalerContext_mac_ct.h",
+      "//third_party/skia/src/ports/SkTypeface_mac_ct.cpp",
+      "//third_party/skia/src/ports/SkTypeface_mac_ct.h",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
@@ -564,7 +572,13 @@ component("skia") {
   if (is_ios) {
     libs = [ "ImageIO.framework" ]
     set_sources_assignment_filter([])
-    sources += [ "//third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp" ]
+    sources += [
+      "//third_party/skia/src/utils/mac/SkCGBase.h",
+      "//third_party/skia/src/utils/mac/SkCGGeometry.h",
+      "//third_party/skia/src/utils/mac/SkCTFontSmoothBehavior.cpp",
+      "//third_party/skia/src/utils/mac/SkCTFontSmoothBehavior.h",
+      "//third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp",
+    ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
@@ -731,6 +745,16 @@ if (current_cpu == "x86" || current_cpu == "x64") {
     }
     visibility = [ ":skia_opts" ]
   }
+  skia_source_set("skia_opts_skx") {
+    sources = skia_opts.skx_sources
+    if (!is_win) {
+      cflags = [ "-march=skylake-avx512" ]
+    }
+    if (is_win) {
+      cflags = [ "/arch:AVX512" ]
+    }
+    visibility = [ ":skia_opts" ]
+  }
 }
 
 skia_source_set("skia_opts") {
@@ -744,6 +768,7 @@ skia_source_set("skia_opts") {
     deps += [
       ":skia_opts_avx",
       ":skia_opts_hsw",
+      ":skia_opts_skx",
       ":skia_opts_sse3",
       ":skia_opts_sse41",
       ":skia_opts_sse42",
@@ -953,3 +978,21 @@ if (!is_ios) {
 group("fuzzers") {
   deps = [ "//skia/tools/fuzzers" ]
 }
+
+grit("skia_resources") {
+  source = "skia_resources.grd"
+
+  outputs = [
+    "grit/skia_resources.h",
+    "grit/skia_resources_map.cc",
+    "grit/skia_resources_map.h",
+    "skia_resources.pak",
+  ]
+
+  grit_flags = [
+    "-E",
+    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+  ]
+
+  deps = [ "public/mojom:mojom_js" ]
+}