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

Roll Skia from b6dfd97c5290 to e1e2a858205f (3 revisions) #31380

Merged
merged 1 commit into from
Feb 10, 2022
Merged

Roll Skia from b6dfd97c5290 to e1e2a858205f (3 revisions) #31380

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': 'b6dfd97c52906c1748b9c2a2406eea44a8daf96c',
'skia_revision': 'e1e2a858205f10e6a7f4fa5fd80d56658115466c',

# 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
6 changes: 3 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: 73ec28a544af6c4f53d57c7ff43fa7f0
Signature: ae1356542bbe4dfd79c9d796b419128a

UNUSED LICENSES:

Expand Down Expand Up @@ -5640,7 +5640,6 @@ FILE: ../../../third_party/skia/src/sksl/SkSLGLSL.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLExpression.cpp
FILE: ../../../third_party/skia/src/sksl/lex/TransitionTable.cpp
FILE: ../../../third_party/skia/src/sksl/lex/TransitionTable.h
FILE: ../../../third_party/skia/src/utils/SkCycles.h
FILE: ../../../third_party/skia/src/utils/SkOrderedFontMgr.cpp
----------------------------------------------------------------------------------------------------
Copyright 2021 Google Inc.
Expand Down Expand Up @@ -6128,6 +6127,8 @@ FILE: ../../../third_party/skia/src/core/SkShaderCodeDictionary.cpp
FILE: ../../../third_party/skia/src/core/SkShaderCodeDictionary.h
FILE: ../../../third_party/skia/src/core/SkUniformData.cpp
FILE: ../../../third_party/skia/src/core/SkUniformData.h
FILE: ../../../third_party/skia/src/gpu/text/GrGlyphVector.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrGlyphVector.h
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp
----------------------------------------------------------------------------------------------------
Copyright 2022 Google LLC
Expand Down Expand Up @@ -6527,7 +6528,6 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/gm/drawlines_with_local_matrix.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/drawlines_with_local_matrix.cpp
FILE: ../../../third_party/skia/src/utils/SkBlitterTrace.h
----------------------------------------------------------------------------------------------------
Copyright 2022 Google Inc.

Expand Down