diff --git a/DEPS b/DEPS index 6af579be07c83..33ef6bc253bab 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': 'fed417995ba9a3d31a18412d723dc508c8fd3832', + 'skia_revision': '870e249c99a78570cb5f4286746a44c72b341ae9', # 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 01071b3930d73..1a6d00d3395e4 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2811,7 +2811,6 @@ ../../../third_party/skia/src/gpu/ganesh/tessellate/BUILD.bazel ../../../third_party/skia/src/gpu/ganesh/text/BUILD.bazel ../../../third_party/skia/src/gpu/ganesh/vk/BUILD.bazel -../../../third_party/skia/src/gpu/gl/BUILD.bazel ../../../third_party/skia/src/gpu/mtl/BUILD.bazel ../../../third_party/skia/src/gpu/tessellate/BUILD.bazel ../../../third_party/skia/src/gpu/vk/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index b5cbf2fa1c8f4..1eac9b188435c 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 959220be4b833bcdb24e336353826031 +Signature: 44f177487c4bef5a7703368e035b9c9e ==================================================================================================== LIBRARY: etc1 @@ -386,6 +386,7 @@ FILE: ../../../third_party/skia/modules/skparagraph/test.html FILE: ../../../third_party/skia/package-lock.json FILE: ../../../third_party/skia/relnotes/skif_runtimeshader_sampleradius.md FILE: ../../../third_party/skia/relnotes/skimagegenerator_grexternaltexturegenerator.md +FILE: ../../../third_party/skia/relnotes/sksamplingoptions_implicit.md FILE: ../../../third_party/skia/relnotes/sksurface_methods.md FILE: ../../../third_party/skia/relnotes/sktablecolorfilter.md FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h @@ -1480,7 +1481,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/geometry/GrPathUtils.cpp + ../. ORIGIN: ../../../third_party/skia/src/gpu/ganesh/geometry/GrPathUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAttachment.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAttachment.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLDefines_impl.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLDefines.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGLSL.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGLSL.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGpu.cpp + ../../../third_party/skia/LICENSE @@ -1501,7 +1502,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/DefaultPathRenderer.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/DefaultPathRenderer.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/gl/GrGLDefines.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/pdf/SkPDFDevice.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/pdf/SkPDFDevice.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/pdf/SkPDFDocument.cpp + ../../../third_party/skia/LICENSE @@ -1663,7 +1663,7 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrPathUtils.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrPathUtils.h FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAttachment.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAttachment.h -FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLDefines_impl.h +FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLDefines.h FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGLSL.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGLSL.h FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGpu.cpp @@ -1684,7 +1684,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer.h FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DefaultPathRenderer.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DefaultPathRenderer.h -FILE: ../../../third_party/skia/src/gpu/gl/GrGLDefines.h FILE: ../../../third_party/skia/src/pdf/SkPDFDevice.cpp FILE: ../../../third_party/skia/src/pdf/SkPDFDevice.h FILE: ../../../third_party/skia/src/pdf/SkPDFDocument.cpp