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 @@ -18,7 +18,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': 'ec407902999bf2c08afa6af4ae55d93709580b4c',
'skia_revision': '44062eff3e250e3902e897231339c3f126c9a3f1',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down
21 changes: 16 additions & 5 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: b1a6dc8898706db1b1209119a252219b
Signature: da3d3cfd186ce9b4eacfb187b28eb32e

UNUSED LICENSES:

Expand Down Expand Up @@ -534,6 +534,9 @@ FILE: ../../../third_party/skia/docker/skia-with-swift-shader-base/Dockerfile
FILE: ../../../third_party/skia/docker/skia-with-swift-shader-base/build-with-swift-shader-and-run
FILE: ../../../third_party/skia/example/BUILD.bazel
FILE: ../../../third_party/skia/experimental/bazel_test/BUILD.bazel
FILE: ../../../third_party/skia/experimental/bazel_test/base/BUILD.bazel
FILE: ../../../third_party/skia/experimental/bazel_test/client/BUILD.bazel
FILE: ../../../third_party/skia/experimental/bazel_test/core/BUILD.bazel
FILE: ../../../third_party/skia/experimental/docs/animationCommon.js
FILE: ../../../third_party/skia/experimental/docs/backend.js
FILE: ../../../third_party/skia/experimental/docs/canvasBackend.js
Expand Down Expand Up @@ -880,6 +883,7 @@ FILE: ../../../third_party/skia/infra/bots/task_drivers/push_bazel_apps_from_was
FILE: ../../../third_party/skia/infra/bots/task_drivers/recreate_skps/BUILD.bazel
FILE: ../../../third_party/skia/infra/bots/task_drivers/run_gn_to_bp/BUILD.bazel
FILE: ../../../third_party/skia/infra/bots/task_drivers/run_wasm_gm_tests/BUILD.bazel
FILE: ../../../third_party/skia/infra/bots/task_drivers/toolchain_layering_check/BUILD.bazel
FILE: ../../../third_party/skia/infra/bots/tasks.json
FILE: ../../../third_party/skia/infra/bots/tools/luci-go/linux64/isolate.sha1
FILE: ../../../third_party/skia/infra/bots/tools/luci-go/mac64/isolate.sha1
Expand Down Expand Up @@ -1178,6 +1182,7 @@ FILE: ../../../third_party/skia/src/utils/win/BUILD.bazel
FILE: ../../../third_party/skia/src/xml/BUILD.bazel
FILE: ../../../third_party/skia/src/xps/BUILD.bazel
FILE: ../../../third_party/skia/toolchain/BUILD.bazel
FILE: ../../../third_party/skia/toolchain/clang_layering_check.bzl
FILE: ../../../third_party/skia/toolchain/download_linux_amd64_toolchain.bzl
FILE: ../../../third_party/skia/toolchain/download_mac_toolchain.bzl
FILE: ../../../third_party/skia/toolchain/download_toolchains.bzl
Expand Down Expand Up @@ -7538,9 +7543,6 @@ FILE: ../../../third_party/skia/modules/svg/include/SkSVGOpenTypeSVGDecoder.h
FILE: ../../../third_party/skia/modules/svg/src/SkSVGOpenTypeSVGDecoder.cpp
FILE: ../../../third_party/skia/src/codec/SkAvifCodec.cpp
FILE: ../../../third_party/skia/src/codec/SkAvifCodec.h
FILE: ../../../third_party/skia/src/codec/SkJpegRCodec.cpp
FILE: ../../../third_party/skia/src/codec/SkJpegRCodec.h
FILE: ../../../third_party/skia/src/codec/SkStubJpegRDecoderAPI.h
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlComputeCommandEncoder.h
FILE: ../../../third_party/skia/src/sfnt/SkOTTable_hmtx.h
FILE: ../../../third_party/skia/src/sksl/codegen/SkSLRasterPipelineBuilder.cpp
Expand Down Expand Up @@ -7610,6 +7612,7 @@ FILE: ../../../third_party/skia/infra/bots/task_drivers/bazel_build/bazel_build.
FILE: ../../../third_party/skia/infra/bots/task_drivers/canvaskit_gold/canvaskit_gold.go
FILE: ../../../third_party/skia/infra/bots/task_drivers/check_generated_files/check_generated_files.go
FILE: ../../../third_party/skia/infra/bots/task_drivers/cpu_tests/cpu_tests.go
FILE: ../../../third_party/skia/infra/bots/task_drivers/toolchain_layering_check/toolchain_layering_check.go
FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp
FILE: ../../../third_party/skia/src/core/SkBuiltInCodeSnippetID.h
FILE: ../../../third_party/skia/src/core/SkCapabilities.cpp
Expand Down Expand Up @@ -7833,8 +7836,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/include/gpu/graphite/dawn/DawnTypes.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/experimental/bazel_test/base/base.h + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/experimental/bazel_test/base/base.h
FILE: ../../../third_party/skia/experimental/bazel_test/base/base_priv.h
FILE: ../../../third_party/skia/experimental/bazel_test/client/gizmo.cpp
FILE: ../../../third_party/skia/experimental/bazel_test/client/gizmo.h
FILE: ../../../third_party/skia/experimental/bazel_test/client/main.cpp
FILE: ../../../third_party/skia/experimental/bazel_test/core/core.cpp
FILE: ../../../third_party/skia/experimental/bazel_test/core/core.h
FILE: ../../../third_party/skia/experimental/bazel_test/core/core_priv.h
FILE: ../../../third_party/skia/include/gpu/MutableTextureState.h
FILE: ../../../third_party/skia/include/gpu/graphite/dawn/DawnTypes.h
FILE: ../../../third_party/skia/include/gpu/graphite/vk/VulkanGraphiteTypes.h
Expand Down