Update Skia from Chromium 100.0.4896.143

Issue: 304784019
Reviewed-on: youtube/cobalt#2495

cobalt/renderer/rasterizer/skia/skia/skia_sources.gni

@@ -119,6 +119,8 @@ sksl_sources = [
   "//third_party/skia/include/sksl/SkSLDebugTrace.h",
   "//third_party/skia/src/sksl/SkSLAnalysis.cpp",
   "//third_party/skia/src/sksl/SkSLAnalysis.h",
+  "//third_party/skia/src/sksl/SkSLBuiltinMap.cpp",
+  "//third_party/skia/src/sksl/SkSLBuiltinMap.h",
   "//third_party/skia/src/sksl/SkSLBuiltinTypes.cpp",
   "//third_party/skia/src/sksl/SkSLBuiltinTypes.h",
   "//third_party/skia/src/sksl/SkSLCompiler.cpp",
@@ -132,8 +134,6 @@ sksl_sources = [
   "//third_party/skia/src/sksl/SkSLErrorReporter.cpp",
   "//third_party/skia/src/sksl/SkSLInliner.cpp",
   "//third_party/skia/src/sksl/SkSLInliner.h",
-  "//third_party/skia/src/sksl/SkSLIntrinsicMap.cpp",
-  "//third_party/skia/src/sksl/SkSLIntrinsicMap.h",
   "//third_party/skia/src/sksl/SkSLLexer.cpp",
   "//third_party/skia/src/sksl/SkSLLexer.h",
   "//third_party/skia/src/sksl/SkSLMangler.cpp",
@@ -156,6 +156,7 @@ sksl_sources = [
   "//third_party/skia/src/sksl/SkSLUtil.h",
   "//third_party/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp",
   "//third_party/skia/src/sksl/analysis/SkSLCheckProgramUnrolledSize.cpp",
+  "//third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp",
   "//third_party/skia/src/sksl/analysis/SkSLGetLoopUnrollInfo.cpp",
   "//third_party/skia/src/sksl/analysis/SkSLIsConstantExpression.cpp",
   "//third_party/skia/src/sksl/analysis/SkSLProgramUsage.cpp",
@@ -173,8 +174,6 @@ sksl_sources = [
   "//third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h",
   "//third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.cpp",
   "//third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h",
-  "//third_party/skia/src/sksl/codegen/SkVMDebugTrace.cpp",
-  "//third_party/skia/src/sksl/codegen/SkVMDebugTrace.h",
   "//third_party/skia/src/sksl/dsl/DSLBlock.cpp",
   "//third_party/skia/src/sksl/dsl/DSLCase.cpp",
   "//third_party/skia/src/sksl/dsl/DSLCore.cpp",
@@ -259,6 +258,8 @@ sksl_sources = [
   "//third_party/skia/src/sksl/ir/SkSLVariable.h",
   "//third_party/skia/src/sksl/ir/SkSLVariableReference.cpp",
   "//third_party/skia/src/sksl/ir/SkSLVariableReference.h",
+  "//third_party/skia/src/sksl/tracing/SkVMDebugTrace.cpp",
+  "//third_party/skia/src/sksl/tracing/SkVMDebugTrace.h",
   "//third_party/skia/src/sksl/transform/SkSLBuiltinVariableScanner.cpp",
   "//third_party/skia/src/sksl/transform/SkSLEliminateDeadFunctions.cpp",
   "//third_party/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariables.cpp",

cobalt/renderer/rasterizer/skia/skia/src/ports/SkTypeface_cobalt.cc

@@ -70,9 +70,9 @@ std::unique_ptr<SkFontData> SkTypeface_Cobalt::onMakeFontData() const {
   if (!stream) {
     return nullptr;
   }
-  return std::make_unique<SkFontData>(std::move(stream), index,
-                                      computed_variation_position_.data(),
-                                      computed_variation_position_.count());
+  return std::make_unique<SkFontData>(
+      std::move(stream), index, 0, computed_variation_position_.data(),
+      computed_variation_position_.count(), nullptr, 0);
 }
 
 SkTypeface_CobaltStream::SkTypeface_CobaltStream(

third_party/skia/.bazelrc

@@ -17,6 +17,10 @@ build --flag_alias=with_gl_standard=//bazel/common_config_settings:with_gl_stand
 
 build --flag_alias=with_icu=//bazel/common_config_settings:use_icu
 build --flag_alias=with_no_icu=no//bazel/common_config_settings:use_icu
+build --flag_alias=disable_tracing=//bazel/common_config_settings:disable_tracing
+build --flag_alias=enable_tracing=no//bazel/common_config_settings:disable_tracing
+build --flag_alias=disable_effect_serialization=//bazel/common_config_settings:disable_effect_serialization
+build --flag_alias=enable_effect_serialization=no//bazel/common_config_settings:disable_effect_serialization
 
 # CanvasKit flags
 build --flag_alias=ck_enable_fonts=//modules/canvaskit:enable_fonts

third_party/skia/.bazelversion

@@ -1 +1 @@
-6.0.0-pre.20211025.1
+5.0.0

third_party/skia/AUTHORS

@@ -74,6 +74,7 @@ JetBrains <*@jetbrains.com>
 Vibe Inc <*@vibe.us>
 Scene Group Ltd. <*@scenegroup.co>
 LG Electronics <*@lge.com>
+Shekhar Dutta <[email protected]>
 
 # Trusted service accounts.
 Recipe roller SA <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>

third_party/skia/BUILD.bazel

@@ -5,21 +5,6 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
 
 package(default_visibility = ["//:__subpackages__"])
 
-cc_test(
-    name = "bazel_test",
-    size = "small",
-    srcs = [
-        "//experimental/bazel_test:srcs",
-        "//include/config:hdrs",
-        "//include/core:hdrs",
-        "//src/ports:skdebug",
-    ],
-    deps = [
-        "//third_party:libpng",
-        "//third_party:musl_compat",
-    ],
-)
-
 selects.config_setting_group(
     name = "needs_jpeg",
     match_any = [
@@ -102,50 +87,5 @@ cc_library(
     deps = CORE_DEPS,
 )
 
-cc_library(
-    name = "hash_and_encode",
-    testonly = True,
-    srcs = [
-        "//tools:cmdline",
-        "//tools:hash_and_encode",
-    ],
-    deps = [
-        ":skia-core",
-        "//third_party:libpng",
-    ],
-)
-
-cc_library(
-    name = "gms",
-    testonly = True,
-    srcs = [
-        "//gm:gms",
-        "//gm:srcs",
-        "//tools:srcs",
-    ],
-    hdrs = [
-        "//gm:hdrs",
-    ],
-    textual_hdrs = ["//tools:txts"],
-    deps = [":skia-core"],
-)
-
-cc_library(
-    name = "tests",
-    testonly = True,
-    srcs = [
-        "//tests:srcs",
-        "//tools:srcs",
-    ],
-    hdrs = [
-        "//tests:hdrs",
-    ],
-    local_defines = [
-        "GR_TEST_UTILS",
-    ],
-    textual_hdrs = ["//tools:txts"],
-    deps = [":skia-core"],
-)
-
 # gazelle:prefix go.skia.org/skia
 gazelle(name = "gazelle")