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

Roll Skia from 06145491fd17 to 4935bed4260d (3 revisions) #46748

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Roll Skia from 06145491fd17 to 4935bed4260d (3 revisions) #46748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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': '06145491fd178fd7a92bd4dfbee99ccbb578d42f',
'skia_revision': '4935bed4260d2c90ec6dad0155314b3ecd889801',

# 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
2 changes: 0 additions & 2 deletions ci/licenses_golden/excluded_files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2650,9 +2650,7 @@
../../../third_party/skia/experimental
../../../third_party/skia/fuzz/README.md
../../../third_party/skia/gm/BUILD.bazel
../../../third_party/skia/gm/android_gm_test.bzl
../../../third_party/skia/gm/png_codec.bzl
../../../third_party/skia/gm/vias/BUILD.bazel
../../../third_party/skia/gn/BUILD.bazel
../../../third_party/skia/gn/__init__.py
../../../third_party/skia/gn/bazel_build.py
Expand Down
10 changes: 1 addition & 9 deletions ci/licenses_golden/licenses_skia
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 4a4949218f693a1592bf1308dfdd43d3
Signature: b01ab1f7f13ff28c50159876260e9ed9

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -8607,7 +8607,6 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/gm/coordclampshader.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/fontations.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/imagefiltersunpremul.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/vias/Draw.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/ports/SkFontMgr_data.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/ports/SkTypeface_fontations.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkGainmapInfo.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -8648,7 +8647,6 @@ TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/coordclampshader.cpp
FILE: ../../../third_party/skia/gm/fontations.cpp
FILE: ../../../third_party/skia/gm/imagefiltersunpremul.cpp
FILE: ../../../third_party/skia/gm/vias/Draw.h
FILE: ../../../third_party/skia/include/ports/SkFontMgr_data.h
FILE: ../../../third_party/skia/include/ports/SkTypeface_fontations.h
FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h
Expand Down Expand Up @@ -8725,15 +8723,12 @@ ORIGIN: ../../../third_party/skia/fuzz/FuzzQuadRoots.cpp + ../../../third_party/
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicRoots.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzPrecompile.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzQuadRoots.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/BazelGMRunner.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/BazelNoopRunner.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/fontations_ft_compare.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/graphite_replay.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/hello_bazel_world.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/png_codec.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/rippleshadergm.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/scaledrects.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/vias/SimpleVias.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/workingspace.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/android/SkCanvasAndroid.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/android/SkHeifDecoder.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -8993,15 +8988,12 @@ FILE: ../../../third_party/skia/fuzz/FuzzQuadRoots.cpp
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicRoots.cpp
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzPrecompile.cpp
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzQuadRoots.cpp
FILE: ../../../third_party/skia/gm/BazelGMRunner.cpp
FILE: ../../../third_party/skia/gm/BazelNoopRunner.cpp
FILE: ../../../third_party/skia/gm/fontations_ft_compare.cpp
FILE: ../../../third_party/skia/gm/graphite_replay.cpp
FILE: ../../../third_party/skia/gm/hello_bazel_world.cpp
FILE: ../../../third_party/skia/gm/png_codec.cpp
FILE: ../../../third_party/skia/gm/rippleshadergm.cpp
FILE: ../../../third_party/skia/gm/scaledrects.cpp
FILE: ../../../third_party/skia/gm/vias/SimpleVias.cpp
FILE: ../../../third_party/skia/gm/workingspace.cpp
FILE: ../../../third_party/skia/include/android/SkCanvasAndroid.h
FILE: ../../../third_party/skia/include/android/SkHeifDecoder.h
Expand Down