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

Roll Skia from a6bff0c3446b to 6742d13cbe2e (9 revisions) #23971

Merged
merged 1 commit into from
Jan 27, 2021
Merged

Roll Skia from a6bff0c3446b to 6742d13cbe2e (9 revisions) #23971

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 @@ -27,7 +27,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': 'a6bff0c3446bb8f85f61aac7746f5810c3179392',
'skia_revision': '6742d13cbe2e8b92ce0f5e109162b8f9647f7ae1',

# 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
10 changes: 8 additions & 2 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: e3f1bc2314feae640582f81db921fb53
Signature: e1ec42beee5a2a94a6314c22864c8cd7

UNUSED LICENSES:

Expand Down Expand Up @@ -5246,6 +5246,8 @@ FILE: ../../../third_party/skia/gm/lazytiling.cpp
FILE: ../../../third_party/skia/gm/runtimeeffectimage.cpp
FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h
FILE: ../../../third_party/skia/src/gpu/GrInnerFanTriangulator.h
FILE: ../../../third_party/skia/src/gpu/GrWritePixelsRenderTask.cpp
FILE: ../../../third_party/skia/src/gpu/GrWritePixelsRenderTask.h
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
Expand Down Expand Up @@ -5975,7 +5977,9 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/gm/colorspace.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/colorspace.cpp
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h
Expand Down Expand Up @@ -7240,8 +7244,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/GrPathStencilFillOp.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathStencilFillOp.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathStencilFillOp.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.h
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.cpp
Expand Down