diff --git a/DEPS b/DEPS index a0751f038d4..5e115d615c7 100644 --- a/DEPS +++ b/DEPS @@ -26,7 +26,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': '03d69876ff0eb33ac9ae968207a72af505b10502', + 'skia_revision': '60a2ec03b662735aa790c2a4f93445d5d687644d', # 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/engine/src/flutter/ci/licenses_golden/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia index 90b3d6543b1..35a969a9a18 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 3adf57ee1216e80ef3d55bd0a6f3f02b +Signature: 513dff797d9688699eb64f55e6f4eecc UNUSED LICENSES: @@ -1022,6 +1022,7 @@ FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/karma.conf.js FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/package.json FILE: ../../../third_party/skia/go.mod FILE: ../../../third_party/skia/go.sum +FILE: ../../../third_party/skia/infra/bots/assets.isolate FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_darwin/VERSION FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_linux/VERSION FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_windows/VERSION @@ -1068,8 +1069,20 @@ FILE: ../../../third_party/skia/infra/bots/assets/valgrind/VERSION FILE: ../../../third_party/skia/infra/bots/assets/win_ninja/VERSION FILE: ../../../third_party/skia/infra/bots/assets/win_toolchain/VERSION FILE: ../../../third_party/skia/infra/bots/assets/xcode-11.4.1/VERSION +FILE: ../../../third_party/skia/infra/bots/canvaskit.isolate FILE: ../../../third_party/skia/infra/bots/cfg.json +FILE: ../../../third_party/skia/infra/bots/compile.isolate +FILE: ../../../third_party/skia/infra/bots/compile_android_framework.isolate +FILE: ../../../third_party/skia/infra/bots/empty.isolate +FILE: ../../../third_party/skia/infra/bots/infra_tests.isolate +FILE: ../../../third_party/skia/infra/bots/infrabots.isolate +FILE: ../../../third_party/skia/infra/bots/ios_bin.isolate FILE: ../../../third_party/skia/infra/bots/jobs.json +FILE: ../../../third_party/skia/infra/bots/lottie_ci.isolate +FILE: ../../../third_party/skia/infra/bots/lottie_web.isolate +FILE: ../../../third_party/skia/infra/bots/pathkit.isolate +FILE: ../../../third_party/skia/infra/bots/perf_puppeteer.isolate +FILE: ../../../third_party/skia/infra/bots/perf_skia_bundled.isolate FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Android_API26.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Android_ASAN.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Chromebook_GLES.json @@ -1188,6 +1201,7 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.exp FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/integer_issue.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/win_test.json +FILE: ../../../third_party/skia/infra/bots/recipes.isolate FILE: ../../../third_party/skia/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json FILE: ../../../third_party/skia/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json FILE: ../../../third_party/skia/infra/bots/recipes/compute_buildstats.expected/normal_bot.json @@ -1255,10 +1269,20 @@ FILE: ../../../third_party/skia/infra/bots/recipes/upload_dm_results.expected/no FILE: ../../../third_party/skia/infra/bots/recipes/upload_dm_results.expected/trybot.json FILE: ../../../third_party/skia/infra/bots/recipes/upload_nano_results.expected/normal_bot.json FILE: ../../../third_party/skia/infra/bots/recipes/upload_nano_results.expected/trybot.json +FILE: ../../../third_party/skia/infra/bots/resources.isolate +FILE: ../../../third_party/skia/infra/bots/run_recipe.isolate +FILE: ../../../third_party/skia/infra/bots/skottie_wasm.isolate +FILE: ../../../third_party/skia/infra/bots/skpbench_skia_bundled.isolate +FILE: ../../../third_party/skia/infra/bots/skqp.isolate +FILE: ../../../third_party/skia/infra/bots/swarm_recipe.isolate +FILE: ../../../third_party/skia/infra/bots/task_drivers.isolate FILE: ../../../third_party/skia/infra/bots/tasks.json +FILE: ../../../third_party/skia/infra/bots/test_skia_bundled.isolate FILE: ../../../third_party/skia/infra/bots/tools/luci-go/linux64/isolate.sha1 FILE: ../../../third_party/skia/infra/bots/tools/luci-go/mac64/isolate.sha1 FILE: ../../../third_party/skia/infra/bots/tools/luci-go/win64/isolate.exe.sha1 +FILE: ../../../third_party/skia/infra/bots/wasm_gm_tests.isolate +FILE: ../../../third_party/skia/infra/bots/whole_repo.isolate FILE: ../../../third_party/skia/infra/canvaskit/docker/canvaskit-emsdk/Dockerfile FILE: ../../../third_party/skia/infra/config/recipes.cfg FILE: ../../../third_party/skia/infra/cross-compile/docker/cross-linux-arm64/Dockerfile @@ -2408,14 +2432,14 @@ FILE: ../../../third_party/skia/src/codec/SkWebpCodec.h FILE: ../../../third_party/skia/src/core/Sk4px.h FILE: ../../../third_party/skia/src/core/SkBigPicture.cpp FILE: ../../../third_party/skia/src/core/SkBigPicture.h -FILE: ../../../third_party/skia/src/core/SkBitmapController.cpp -FILE: ../../../third_party/skia/src/core/SkBitmapController.h FILE: ../../../third_party/skia/src/core/SkFontMgr.cpp FILE: ../../../third_party/skia/src/core/SkLatticeIter.cpp FILE: ../../../third_party/skia/src/core/SkLatticeIter.h FILE: ../../../third_party/skia/src/core/SkLocalMatrixImageFilter.cpp FILE: ../../../third_party/skia/src/core/SkMiniRecorder.cpp FILE: ../../../third_party/skia/src/core/SkMiniRecorder.h +FILE: ../../../third_party/skia/src/core/SkMipmapAccessor.cpp +FILE: ../../../third_party/skia/src/core/SkMipmapAccessor.h FILE: ../../../third_party/skia/src/core/SkNextID.h FILE: ../../../third_party/skia/src/core/SkOpts.cpp FILE: ../../../third_party/skia/src/core/SkOpts.h @@ -6473,9 +6497,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/infra/bots/gen_tasks_logic/compile_cas.go + ../../../LICENSE +ORIGIN: ../../../third_party/skia/infra/bots/gen_tasks_logic/dm_flags.go + ../../../LICENSE TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/compile_cas.go FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/dm_flags.go FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/job_builder.go FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/nano_flags.go