Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 6746712

Browse files
Roll Skia from c162dae2b297 to dfc65350a1fd (16 revisions) (#40940)
Roll Skia from c162dae2b297 to dfc65350a1fd (16 revisions)
1 parent db23c3f commit 6746712

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': 'c162dae2b29713736750af2e39f1acf5d458478f',
21+
'skia_revision': 'dfc65350a1fd65536c1fd0331ba101d36d36c096',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

ci/licenses_golden/excluded_files

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2835,12 +2835,15 @@
28352835
../../../third_party/skia/third_party/piet-gpu/Makefile
28362836
../../../third_party/skia/third_party/vulkanmemoryallocator/BUILD.bazel
28372837
../../../third_party/skia/toolchain/BUILD.bazel
2838+
../../../third_party/skia/toolchain/android_trampolines/gen_trampolines/BUILD.bazel
28382839
../../../third_party/skia/toolchain/clang_layering_check.bzl
28392840
../../../third_party/skia/toolchain/download_linux_amd64_toolchain.bzl
28402841
../../../third_party/skia/toolchain/download_mac_toolchain.bzl
2842+
../../../third_party/skia/toolchain/download_ndk_linux_amd64_toolchain.bzl
28412843
../../../third_party/skia/toolchain/download_toolchains.bzl
28422844
../../../third_party/skia/toolchain/linux_amd64_toolchain_config.bzl
28432845
../../../third_party/skia/toolchain/mac_toolchain_config.bzl
2846+
../../../third_party/skia/toolchain/ndk_linux_arm64_toolchain_config.bzl
28442847
../../../third_party/skia/toolchain/utils.bzl
28452848
../../../third_party/skia/tools
28462849
../../../third_party/sqlite/.git

ci/licenses_golden/licenses_skia

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 8ee8750ec91435fbd8334baa10ee0e35
1+
Signature: 26e0232894d6cf9d81e7b1652dd44468
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -417,6 +417,7 @@ FILE: ../../../third_party/skia/src/sksl/sksl_shared.sksl
417417
FILE: ../../../third_party/skia/src/sksl/sksl_vert.sksl
418418
FILE: ../../../third_party/skia/third_party/libmicrohttpd/MHD_config.h
419419
FILE: ../../../third_party/skia/toolchain/linux_trampolines/IWYU_mapping.imp
420+
FILE: ../../../third_party/skia/toolchain/ndk.BUILD
420421
FILE: ../../../third_party/skia/whitespace.txt
421422
----------------------------------------------------------------------------------------------------
422423
Copyright (c) 2011 Google Inc. All rights reserved.
@@ -9018,6 +9019,7 @@ ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLReturnsInputAlpha.cpp +
90189019
ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.cpp + ../../../third_party/skia/LICENSE
90199020
ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.h + ../../../third_party/skia/LICENSE
90209021
ORIGIN: ../../../third_party/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp + ../../../third_party/skia/LICENSE
9022+
ORIGIN: ../../../third_party/skia/toolchain/android_trampolines/gen_trampolines/gen_trampolines.go + ../../../third_party/skia/LICENSE
90219023
TYPE: LicenseType.bsd
90229024
FILE: ../../../third_party/skia/fuzz/FuzzCubicQuadRoots.cpp
90239025
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp
@@ -9087,6 +9089,7 @@ FILE: ../../../third_party/skia/src/sksl/analysis/SkSLReturnsInputAlpha.cpp
90879089
FILE: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.cpp
90889090
FILE: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.h
90899091
FILE: ../../../third_party/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp
9092+
FILE: ../../../third_party/skia/toolchain/android_trampolines/gen_trampolines/gen_trampolines.go
90909093
----------------------------------------------------------------------------------------------------
90919094
Copyright 2023 Google LLC
90929095

0 commit comments

Comments
 (0)