Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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': '46f5c5f08b619a039104aff7aec342bd22619e45',
'skia_revision': '9e8f60534464df9597d189159d26c2f24f221d8e',

# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
Expand Down
7 changes: 4 additions & 3 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 8528ab1e026569ddcc9970f0d52a4eb7
Signature: be6c19483a4658977e6c92d871ad8bb1

UNUSED LICENSES:

Expand Down Expand Up @@ -1007,6 +1007,7 @@ FILE: ../../../third_party/skia/infra/bots/assets/cmake_mac/VERSION
FILE: ../../../third_party/skia/infra/bots/assets/gcloud_linux/VERSION
FILE: ../../../third_party/skia/infra/bots/assets/go/VERSION
FILE: ../../../third_party/skia/infra/bots/assets/go_win/VERSION
FILE: ../../../third_party/skia/infra/bots/assets/ios-dev-image-11.4/VERSION
FILE: ../../../third_party/skia/infra/bots/assets/linux_vulkan_sdk/VERSION
FILE: ../../../third_party/skia/infra/bots/assets/lottie-samples/VERSION
FILE: ../../../third_party/skia/infra/bots/assets/mesa_intel_driver_linux/VERSION
Expand Down Expand Up @@ -1143,6 +1144,7 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.e
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/exceptions.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/ios_rerun_with_debug.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
Expand Down Expand Up @@ -3694,6 +3696,7 @@ FILE: ../../../third_party/skia/include/atlastext/SkAtlasTextFont.h
FILE: ../../../third_party/skia/include/atlastext/SkAtlasTextRenderer.h
FILE: ../../../third_party/skia/include/atlastext/SkAtlasTextTarget.h
FILE: ../../../third_party/skia/include/codec/SkEncodedOrigin.h
FILE: ../../../third_party/skia/include/core/SkDeferredDisplayList.h
FILE: ../../../third_party/skia/include/core/SkDeferredDisplayListRecorder.h
FILE: ../../../third_party/skia/include/core/SkExecutor.h
FILE: ../../../third_party/skia/include/core/SkFontArguments.h
Expand All @@ -3712,7 +3715,6 @@ FILE: ../../../third_party/skia/include/gpu/GrBackendSurface.h
FILE: ../../../third_party/skia/include/gpu/mock/GrMockTypes.h
FILE: ../../../third_party/skia/include/gpu/mtl/GrMtlTypes.h
FILE: ../../../third_party/skia/include/private/GrSharedEnums.h
FILE: ../../../third_party/skia/include/private/SkDeferredDisplayList.h
FILE: ../../../third_party/skia/include/private/SkImageInfoPriv.h
FILE: ../../../third_party/skia/include/private/SkMalloc.h
FILE: ../../../third_party/skia/include/private/SkShadowFlags.h
Expand Down Expand Up @@ -6375,7 +6377,6 @@ ORIGIN: ../../../third_party/skia/modules/canvaskit/canvaskit/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/modules/canvaskit/canvaskit/NotoSerif-Regular.ttf
FILE: ../../../third_party/skia/modules/canvaskit/canvaskit/Roboto-Regular.ttf
FILE: ../../../third_party/skia/modules/canvaskit/canvaskit/Roboto-Regular.woff
FILE: ../../../third_party/skia/modules/canvaskit/canvaskit/example.html
FILE: ../../../third_party/skia/modules/canvaskit/canvaskit/extra.html
FILE: ../../../third_party/skia/modules/canvaskit/canvaskit/node.example.js
Expand Down