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

Roll Skia from 1c823674d957 to 2d2f82c00aeb (13 revisions) #22015

Merged
merged 1 commit into from
Oct 21, 2020
Merged

Roll Skia from 1c823674d957 to 2d2f82c00aeb (13 revisions) #22015

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 @@ -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': '1c823674d957ad8cadf577c3bdc4039d8821be2e',
'skia_revision': '2d2f82c00aeb8d82f37911621a287fe7cee00dbc',

# 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
5 changes: 2 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: 41a3732cd420fc510eeec5ac7809b7f4
Signature: 0e8ec177a82c430d86c666c78510f189

UNUSED LICENSES:

Expand Down Expand Up @@ -1696,7 +1696,6 @@ FILE: ../../../third_party/skia/src/effects/SkPackBits.cpp
FILE: ../../../third_party/skia/src/effects/SkTableMaskFilter.cpp
FILE: ../../../third_party/skia/src/gpu/GrAttachment.cpp
FILE: ../../../third_party/skia/src/gpu/GrAttachment.h
FILE: ../../../third_party/skia/src/gpu/GrContext.cpp
FILE: ../../../third_party/skia/src/gpu/GrGpu.h
FILE: ../../../third_party/skia/src/gpu/GrGpuResource.cpp
FILE: ../../../third_party/skia/src/gpu/GrNativeRect.h
Expand Down Expand Up @@ -5602,6 +5601,7 @@ FILE: ../../../third_party/skia/src/sksl/SkSLRehydrator.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLRehydrator.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructor.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIRNode.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLNodeArrayWrapper.h
----------------------------------------------------------------------------------------------------
Copyright 2020 Google LLC.

Expand Down Expand Up @@ -6344,7 +6344,6 @@ ORIGIN: ../../../third_party/skia/include/gpu/GrConfig.h + ../../../third_party/
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/include/gpu/GrConfig.h
FILE: ../../../third_party/skia/include/gpu/GrTypes.h
FILE: ../../../third_party/skia/include/private/GrContext.h
FILE: ../../../third_party/skia/src/core/SkImageInfo.cpp
FILE: ../../../third_party/skia/src/core/SkRasterClip.cpp
FILE: ../../../third_party/skia/src/core/SkRasterClip.h
Expand Down