diff --git a/DEPS b/DEPS index 47c9882ebf9a6..b03196c5d992d 100644 --- a/DEPS +++ b/DEPS @@ -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': 'adadb95a9f1ef21ccc5264c7d0bdc83b56cf91e9', + 'skia_revision': '1dc2d0fe0fa05573f58c64ca522132c94f73674d', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 61b5769c08724..4e46ee1adefd1 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 3edbbccb41c8572ea9d16487a55307f5 +Signature: 5f067568edb964a3f480a9792a59de76 UNUSED LICENSES: @@ -3962,9 +3962,11 @@ FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.h FILE: ../../../third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp FILE: ../../../third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp +FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeImage.h FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h FILE: ../../../third_party/skia/modules/svg/include/SkSVGImage.h FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h +FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeImage.cpp FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp FILE: ../../../third_party/skia/modules/svg/src/SkSVGImage.cpp FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp @@ -5204,6 +5206,8 @@ 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/gpu/SkGpuDevice_nga.cpp +FILE: ../../../third_party/skia/src/gpu/SkGpuDevice_nga.h FILE: ../../../third_party/skia/src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp FILE: ../../../third_party/skia/src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.cpp @@ -5211,6 +5215,7 @@ FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.h FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp +FILE: ../../../third_party/skia/src/sksl/SkSLIntrinsicList.h FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h FILE: ../../../third_party/skia/src/sksl/SkSLOperators.cpp FILE: ../../../third_party/skia/src/sksl/SkSLOperators.h @@ -5515,14 +5520,15 @@ FILE: ../../../third_party/skia/include/sksl/DSLErrorHandling.h FILE: ../../../third_party/skia/include/sksl/DSLFunction.h FILE: ../../../third_party/skia/include/sksl/DSLRuntimeEffects.h FILE: ../../../third_party/skia/include/sksl/DSLStatement.h +FILE: ../../../third_party/skia/include/sksl/DSLWrapper.h FILE: ../../../third_party/skia/src/gpu/GrVertexChunkArray.h +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/gpu/tessellate/GrStrokeFixedCountTessellator.cpp FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeFixedCountTessellator.h FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeTessellator.h -FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatingStencilFillOp.cpp -FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatingStencilFillOp.h FILE: ../../../third_party/skia/src/sksl/SkSLMangler.cpp FILE: ../../../third_party/skia/src/sksl/dsl/DSLBlock.cpp FILE: ../../../third_party/skia/src/sksl/dsl/DSLCase.cpp @@ -5531,6 +5537,7 @@ FILE: ../../../third_party/skia/src/sksl/dsl/DSLRuntimeEffects.cpp FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLFPs.cpp FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLFPs.h +FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariable.cpp ---------------------------------------------------------------------------------------------------- Copyright 2021 Google LLC. @@ -6725,6 +6732,7 @@ FILE: ../../../third_party/skia/modules/canvaskit/npm_build/node.example.js FILE: ../../../third_party/skia/modules/canvaskit/npm_build/package-lock.json FILE: ../../../third_party/skia/modules/canvaskit/npm_build/package.json FILE: ../../../third_party/skia/modules/canvaskit/npm_build/shaping.html +FILE: ../../../third_party/skia/modules/canvaskit/npm_build/textapi_utils.js FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/canvaskit-wasm-tests.ts FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/index.d.ts FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/tsconfig.json