diff --git a/DEPS b/DEPS index 204add053ed89e0f1f7cd7196de52b51832bf9df..46d5910397eb8700e4718c83b7df690766eea493 100644 --- a/DEPS +++ b/DEPS @@ -27,7 +27,7 @@ vars = { 'skia_git': 'https://skia.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': '8ed7a8d1c659dba0463d7433caa1e5d9244f843f', + 'skia_revision': 'a4d85e708b8e6b8102165884c40177632f9db0d0', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index ee7a1cfd366268b5f1d036fb10e521c2a8756516..05d3cf8e00dc73651564e7022bc342c777a5a55a 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 467010293392307262c6fc3eb2fb518b +Signature: 4ac8783da350627c1e97ba10745cb79f UNUSED LICENSES: @@ -1224,6 +1224,7 @@ FILE: ../../../third_party/skia/infra/bots/recipes/recreate_skps.expected/failed FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json +FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Metal_AllPathsVolatile_Skpbench.json FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-AllPathsVolatile_Skpbench.json FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json @@ -1362,78 +1363,10 @@ FILE: ../../../third_party/skia/modules/skparagraph/test.html FILE: ../../../third_party/skia/modules/skparagraph/utils/TestFontCollection.cpp FILE: ../../../third_party/skia/modules/skparagraph/utils/TestFontCollection.h FILE: ../../../third_party/skia/public.bzl -FILE: ../../../third_party/skia/site/METADATA -FILE: ../../../third_party/skia/site/dev/METADATA -FILE: ../../../third_party/skia/site/dev/contrib/SuggestedReviewers.png -FILE: ../../../third_party/skia/site/dev/design/PdfLogicalDocumentStructure.png -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.1.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.1.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.1.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.1.svg -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.2.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.2.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.2.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.2.svg -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.2.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.1.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.1.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.1.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.1.svg -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.2.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.2.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.2.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.2.svg -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.3.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.3.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.3.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/corollary2.3.3.svg -FILE: ../../../third_party/skia/site/dev/design/conical/lemma1.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/lemma1.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/lemma1.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/lemma1.svg -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.1.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.1.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.1.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.1.svg -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.2.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.2.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.2.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.2.svg -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/lemma3.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/lemma4.ggb!/geogebra.xml -FILE: ../../../third_party/skia/site/dev/design/conical/lemma4.ggb!/geogebra_javascript.js -FILE: ../../../third_party/skia/site/dev/design/conical/lemma4.ggb!/geogebra_thumbnail.png -FILE: ../../../third_party/skia/site/dev/design/conical/lemma4.svg -FILE: ../../../third_party/skia/site/dev/tools/buttons.png -FILE: ../../../third_party/skia/site/dev/tools/calendar.mskp -FILE: ../../../third_party/skia/site/dev/tools/crosshair.png -FILE: ../../../third_party/skia/site/dev/tools/debugger.png -FILE: ../../../third_party/skia/site/dev/tools/end.png -FILE: ../../../third_party/skia/site/dev/tools/expand.png -FILE: ../../../third_party/skia/site/dev/tools/frameplayback.png -FILE: ../../../third_party/skia/site/dev/tools/gpuop.png -FILE: ../../../third_party/skia/site/dev/tools/image.png -FILE: ../../../third_party/skia/site/dev/tools/layers.png -FILE: ../../../third_party/skia/site/dev/tools/onlinedebugger.png -FILE: ../../../third_party/skia/site/dev/tools/playcommands.png -FILE: ../../../third_party/skia/site/dev/tools/resources.png -FILE: ../../../third_party/skia/site/dev/tools/settings.png -FILE: ../../../third_party/skia/site/dev/tools/tracing.png -FILE: ../../../third_party/skia/site/dev/tools/tracing_load.png -FILE: ../../../third_party/skia/site/favicon.ico -FILE: ../../../third_party/skia/site/user/METADATA -FILE: ../../../third_party/skia/site/user/api/METADATA -FILE: ../../../third_party/skia/site/user/api/catalog.htm -FILE: ../../../third_party/skia/site/user/modules/METADATA -FILE: ../../../third_party/skia/site/user/modules/PathKit_effects.png -FILE: ../../../third_party/skia/site2/_index.html -FILE: ../../../third_party/skia/site2/about/_index.html -FILE: ../../../third_party/skia/site2/config.toml -FILE: ../../../third_party/skia/site2/featured-background.png +FILE: ../../../third_party/skia/site/_index.html +FILE: ../../../third_party/skia/site/about/_index.html +FILE: ../../../third_party/skia/site/config.toml +FILE: ../../../third_party/skia/site/featured-background.png FILE: ../../../third_party/skia/specs/web-img-decode/current/index.html FILE: ../../../third_party/skia/specs/web-img-decode/proposed/impl/impl.js FILE: ../../../third_party/skia/specs/web-img-decode/proposed/index.html @@ -5159,6 +5092,8 @@ FILE: ../../../third_party/skia/src/sksl/SkSLOperators.cpp FILE: ../../../third_party/skia/src/sksl/SkSLOperators.h FILE: ../../../third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLBlock.cpp +FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp +FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.h FILE: ../../../third_party/skia/src/sksl/ir/SkSLDoStatement.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLExpressionStatement.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp