Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Roll Skia from 15d36b15bca1 to 9423a8a0fc2d (37 revisions) #38631

Merged
merged 1 commit into from
Jan 4, 2023
Merged

Roll Skia from 15d36b15bca1 to 9423a8a0fc2d (37 revisions) #38631

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': '15d36b15bca1de4a28e7feafbf282d6632405eb4',
'skia_revision': '9423a8a0fc2d8b93b4a6a909d1955c04f4be06ae',

# 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: 2 additions & 0 deletions ci/licenses_golden/excluded_files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2481,6 +2481,8 @@
../../../third_party/skia/include/BUILD.bazel
../../../third_party/skia/include/OWNERS
../../../third_party/skia/include/android/BUILD.bazel
../../../third_party/skia/include/base/BUILD.bazel
../../../third_party/skia/include/base/README.md
../../../third_party/skia/include/codec/BUILD.bazel
../../../third_party/skia/include/config/BUILD.bazel
../../../third_party/skia/include/core/BUILD.bazel
Expand Down
24 changes: 21 additions & 3 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: bfb6bf0a5ad2b5218f7ecece4a305148
Signature: 83a3161dc427b108aedd5013fc2530c8

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -7359,7 +7359,8 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.cpp + ../..
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Buffer.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Buffer.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/DrawBufferManager.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/BufferManager.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/BufferManager.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/DrawBufferManager.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBlitCommandEncoder.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBuffer.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -7445,7 +7446,8 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.h
FILE: ../../../third_party/skia/src/gpu/graphite/Buffer.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/Buffer.h
FILE: ../../../third_party/skia/src/gpu/graphite/DrawBufferManager.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/BufferManager.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/BufferManager.h
FILE: ../../../third_party/skia/src/gpu/graphite/DrawBufferManager.h
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBlitCommandEncoder.h
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBuffer.h
Expand Down Expand Up @@ -8272,6 +8274,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
LIBRARY: skia
ORIGIN: ../../../third_party/skia/gm/bug12866.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/crbug_1313579.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/base/SkAPI.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/base/SkAlign.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/base/SkAssert.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/base/SkAttributes.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/base/SkDebug.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/base/SkFeatures.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/base/SkLoadUserConfig.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkAlphaType.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkCapabilities.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkColorType.h + ../../../third_party/skia/LICENSE
Expand All @@ -8285,6 +8294,7 @@ ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlUtils.h + ../../..
ORIGIN: ../../../third_party/skia/include/gpu/graphite/vk/VulkanGraphiteUtils.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/gpu/vk/VulkanBackendContext.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkAlignedStorage.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkPathEnums.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkTypeTraits.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/sksl/SkSLVersion.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -8484,6 +8494,13 @@ ORIGIN: ../../../third_party/skia/src/utils/SkTestCanvas.h + ../../../third_part
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/bug12866.cpp
FILE: ../../../third_party/skia/gm/crbug_1313579.cpp
FILE: ../../../third_party/skia/include/base/SkAPI.h
FILE: ../../../third_party/skia/include/base/SkAlign.h
FILE: ../../../third_party/skia/include/base/SkAssert.h
FILE: ../../../third_party/skia/include/base/SkAttributes.h
FILE: ../../../third_party/skia/include/base/SkDebug.h
FILE: ../../../third_party/skia/include/base/SkFeatures.h
FILE: ../../../third_party/skia/include/base/SkLoadUserConfig.h
FILE: ../../../third_party/skia/include/core/SkAlphaType.h
FILE: ../../../third_party/skia/include/core/SkCapabilities.h
FILE: ../../../third_party/skia/include/core/SkColorType.h
Expand All @@ -8497,6 +8514,7 @@ FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlUtils.h
FILE: ../../../third_party/skia/include/gpu/graphite/vk/VulkanGraphiteUtils.h
FILE: ../../../third_party/skia/include/gpu/vk/VulkanBackendContext.h
FILE: ../../../third_party/skia/include/private/SkAlignedStorage.h
FILE: ../../../third_party/skia/include/private/SkPathEnums.h
FILE: ../../../third_party/skia/include/private/SkTypeTraits.h
FILE: ../../../third_party/skia/include/sksl/SkSLVersion.h
FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp
Expand Down