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

Roll Skia from 58c031441cbb to 18cf818e044f (6 revisions) #44234

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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': '58c031441cbb266de8b8b76244b0952f35778c80',
'skia_revision': '18cf818e044f90466b59c4d82d37cb4001eacc71',

# 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
14 changes: 7 additions & 7 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 80d025815ea7af6f4420c3cd8fba2a73
Signature: 035d63d2280647b7a50dc81a4afaf5ed

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -4032,7 +4032,7 @@ ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLIndexExpression.h + ../../../t
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLInterfaceBlock.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLLayout.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLLiteral.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLModifiers.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLModifierFlags.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLNop.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLPostfixExpression.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -4341,7 +4341,7 @@ FILE: ../../../third_party/skia/src/sksl/ir/SkSLIndexExpression.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLInterfaceBlock.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLLayout.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLLiteral.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifiers.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifierFlags.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLNop.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLPostfixExpression.h
Expand Down Expand Up @@ -6924,10 +6924,10 @@ ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp + ../../.
ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLExpression.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLExpression.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLModifiers.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLType.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLType.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLModifiers.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/utils/SkCustomTypeface.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -7062,10 +7062,10 @@ FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp
FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h
FILE: ../../../third_party/skia/src/sksl/dsl/DSLExpression.cpp
FILE: ../../../third_party/skia/src/sksl/dsl/DSLExpression.h
FILE: ../../../third_party/skia/src/sksl/dsl/DSLModifiers.h
FILE: ../../../third_party/skia/src/sksl/dsl/DSLType.cpp
FILE: ../../../third_party/skia/src/sksl/dsl/DSLType.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifiers.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.h
FILE: ../../../third_party/skia/src/utils/SkCustomTypeface.cpp
Expand Down Expand Up @@ -7927,7 +7927,7 @@ ORIGIN: ../../../third_party/skia/src/sksl/SkSLProgramKind.h + ../../../third_pa
ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLModifiers.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLModifierFlags.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLPoison.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLVariable.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinVariables.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -7962,7 +7962,7 @@ FILE: ../../../third_party/skia/src/sksl/SkSLProgramKind.h
FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp
FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifiers.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifierFlags.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLPoison.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariable.cpp
FILE: ../../../third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinVariables.cpp
Expand Down