diff --git a/DEPS b/DEPS index ea32bd7fa6735..d670c5fa6f011 100644 --- a/DEPS +++ b/DEPS @@ -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': 'ffa425bacfc437de72d049e2cc488a90cb1f0036', + 'skia_revision': 'caff30d16ae7411fb6a7a192d4ac8aa112d2b31d', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index ef69cbb78849f..822e41f492c89 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2820,7 +2820,6 @@ ../../../third_party/skia/src/sksl/analysis/BUILD.bazel ../../../third_party/skia/src/sksl/codegen/BUILD.bazel ../../../third_party/skia/src/sksl/dsl/BUILD.bazel -../../../third_party/skia/src/sksl/dsl/priv/BUILD.bazel ../../../third_party/skia/src/sksl/ir/BUILD.bazel ../../../third_party/skia/src/sksl/lex/BUILD.bazel ../../../third_party/skia/src/sksl/tracing/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index fc990d7eceff0..92d3270625f1e 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 928a95b118579cada8f8012e2c5b34e0 +Signature: df7acea58019fa5db2e22522116d975b ==================================================================================================== LIBRARY: etc1 @@ -391,6 +391,7 @@ FILE: ../../../third_party/skia/relnotes/skimage_methods.md FILE: ../../../third_party/skia/relnotes/skimage_subset.md FILE: ../../../third_party/skia/relnotes/skimagefilters_magnifier.md FILE: ../../../third_party/skia/relnotes/skimagefilters_picture.md +FILE: ../../../third_party/skia/relnotes/skimagefilters_shader.md FILE: ../../../third_party/skia/relnotes/skimagegenerator_encoded.md FILE: ../../../third_party/skia/relnotes/sksurface_backend.md FILE: ../../../third_party/skia/relnotes/sksurface_namespace.md @@ -1877,7 +1878,6 @@ ORIGIN: ../../../third_party/skia/include/core/SkStrokeRec.h + ../../../third_pa ORIGIN: ../../../third_party/skia/include/core/SkSurface.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/gl/GrGLFunctions.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/pathops/SkPathOps.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/include/private/SkChecksum.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkPathRef.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkWeakRefCnt.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/utils/SkNullCanvas.h + ../../../third_party/skia/LICENSE @@ -1885,6 +1885,7 @@ ORIGIN: ../../../third_party/skia/src/base/SkMathPriv.h + ../../../third_party/s ORIGIN: ../../../third_party/skia/src/base/SkTInternalLList.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkColorTable.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkAnnotation.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkChecksum.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkFontDescriptor.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkFontDescriptor.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkImagePriv.h + ../../../third_party/skia/LICENSE @@ -2036,7 +2037,6 @@ FILE: ../../../third_party/skia/include/core/SkStrokeRec.h FILE: ../../../third_party/skia/include/core/SkSurface.h FILE: ../../../third_party/skia/include/gpu/gl/GrGLFunctions.h FILE: ../../../third_party/skia/include/pathops/SkPathOps.h -FILE: ../../../third_party/skia/include/private/SkChecksum.h FILE: ../../../third_party/skia/include/private/SkPathRef.h FILE: ../../../third_party/skia/include/private/SkWeakRefCnt.h FILE: ../../../third_party/skia/include/utils/SkNullCanvas.h @@ -2044,6 +2044,7 @@ FILE: ../../../third_party/skia/src/base/SkMathPriv.h FILE: ../../../third_party/skia/src/base/SkTInternalLList.h FILE: ../../../third_party/skia/src/codec/SkColorTable.h FILE: ../../../third_party/skia/src/core/SkAnnotation.cpp +FILE: ../../../third_party/skia/src/core/SkChecksum.h FILE: ../../../third_party/skia/src/core/SkFontDescriptor.cpp FILE: ../../../third_party/skia/src/core/SkFontDescriptor.h FILE: ../../../third_party/skia/src/core/SkImagePriv.h @@ -6977,7 +6978,6 @@ 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/codegen/SkSLVMCodeGenerator.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSL.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLCore.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLCore.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLExpression.cpp + ../../../third_party/skia/LICENSE @@ -6986,8 +6986,6 @@ ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLModifiers.h + ../../../third_p 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/dsl/DSLVar.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/dsl/priv/DSLWriter.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/dsl/priv/DSLWriter.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/SkSLPrefixExpression.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.h + ../../../third_party/skia/LICENSE @@ -7125,7 +7123,6 @@ FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h FILE: ../../../third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.cpp FILE: ../../../third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h -FILE: ../../../third_party/skia/src/sksl/dsl/DSL.h FILE: ../../../third_party/skia/src/sksl/dsl/DSLCore.cpp FILE: ../../../third_party/skia/src/sksl/dsl/DSLCore.h FILE: ../../../third_party/skia/src/sksl/dsl/DSLExpression.cpp @@ -7134,8 +7131,6 @@ 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/dsl/DSLVar.h -FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLWriter.cpp -FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLWriter.h FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h FILE: ../../../third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.h @@ -8009,7 +8004,6 @@ ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp + ../../../third_ ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLFunction.h + ../../../third_party/skia/LICENSE 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/dsl/priv/DSL_priv.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/SkSLPoison.h + ../../../third_party/skia/LICENSE @@ -8047,7 +8041,6 @@ FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.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/dsl/priv/DSL_priv.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/SkSLPoison.h