diff --git a/DEPS b/DEPS index ff467db73897c..f25ab97b51386 100644 --- a/DEPS +++ b/DEPS @@ -17,7 +17,7 @@ vars = { 'llvm_git': 'https://llvm.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': 'e7d10257ffb5cf3ba7d8ad7af58bd806cd44f35b', + 'skia_revision': '4e42423c7f6f755d9d2be9611912f78099a5a61e', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 094eedba6a3bf..4f429a36cdeb6 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: e65c8018bc4c65a078d1e1e152961918 +Signature: 10b9cf8b7a5d9f2d2ab88f5b221340f8 ==================================================================================================== LIBRARY: etc1 @@ -396,16 +396,6 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html FILE: ../../../flutter/third_party/skia/package-lock.json -FILE: ../../../flutter/third_party/skia/relnotes/BackendTextureFromView.md -FILE: ../../../flutter/third_party/skia/relnotes/ForLoopScopes.md -FILE: ../../../flutter/third_party/skia/relnotes/PDF_jpeg.md -FILE: ../../../flutter/third_party/skia/relnotes/SwitchScopes.md -FILE: ../../../flutter/third_party/skia/relnotes/Tick.md -FILE: ../../../flutter/third_party/skia/relnotes/TopLevelShadowing.md -FILE: ../../../flutter/third_party/skia/relnotes/font.md -FILE: ../../../flutter/third_party/skia/relnotes/fontmgr.md -FILE: ../../../flutter/third_party/skia/relnotes/grglmakeinterface.md -FILE: ../../../flutter/third_party/skia/relnotes/skfontarguments_type.md FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl @@ -8802,6 +8792,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrTextureGe ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/graphite/ContextOptionsPriv.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/BentleyOttmann1.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/BruteForceCrossings.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Contour.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/EventQueue.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/EventQueueInterface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Int96.h + ../../../flutter/third_party/skia/LICENSE @@ -8811,6 +8802,7 @@ ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Segment ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/SweepLine.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/BentleyOttmann1.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/BruteForceCrossings.cpp + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Contour.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/EventQueue.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Int96.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Myers.cpp + ../../../flutter/third_party/skia/LICENSE @@ -9093,6 +9085,7 @@ FILE: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrTextureGene FILE: ../../../flutter/third_party/skia/include/private/gpu/graphite/ContextOptionsPriv.h FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/BentleyOttmann1.h FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/BruteForceCrossings.h +FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Contour.h FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/EventQueue.h FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/EventQueueInterface.h FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Int96.h @@ -9102,6 +9095,7 @@ FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Segment.h FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/SweepLine.h FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/BentleyOttmann1.cpp FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/BruteForceCrossings.cpp +FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Contour.cpp FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/EventQueue.cpp FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Int96.cpp FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Myers.cpp