diff --git a/DEPS b/DEPS index 420784e44efa3..99acdf8fea3f4 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': 'b17ee34f337883f45840d16927eb9eb799df8768', + 'skia_revision': '007386294889e0b0499c84dd89af34e616248325', # 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 8591fb72238be..b1781c393291f 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2666,7 +2666,6 @@ ../../../third_party/skia/include/encode/BUILD.bazel ../../../third_party/skia/include/gpu/BUILD.bazel ../../../third_party/skia/include/gpu/d3d/BUILD.bazel -../../../third_party/skia/include/gpu/dawn/BUILD.bazel ../../../third_party/skia/include/gpu/ganesh/BUILD.bazel ../../../third_party/skia/include/gpu/ganesh/gl/BUILD.bazel ../../../third_party/skia/include/gpu/ganesh/mtl/BUILD.bazel @@ -2807,7 +2806,6 @@ ../../../third_party/skia/src/gpu/dawn/BUILD.bazel ../../../third_party/skia/src/gpu/ganesh/BUILD.bazel ../../../third_party/skia/src/gpu/ganesh/d3d/BUILD.bazel -../../../third_party/skia/src/gpu/ganesh/dawn/BUILD.bazel ../../../third_party/skia/src/gpu/ganesh/effects/BUILD.bazel ../../../third_party/skia/src/gpu/ganesh/geometry/BUILD.bazel ../../../third_party/skia/src/gpu/ganesh/gl/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 0d07f3b87ad30..6134948784dcb 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 094fbf0c9e66d3e41afea2dc7c2323ca +Signature: 335a306b95bd3fd20b6ee5a14672e7ff ==================================================================================================== LIBRARY: etc1 @@ -387,6 +387,7 @@ FILE: ../../../third_party/skia/modules/skparagraph/test.html FILE: ../../../third_party/skia/package-lock.json FILE: ../../../third_party/skia/relnotes/sksl_always_on.md FILE: ../../../third_party/skia/relnotes/sksl_comma_array.md +FILE: ../../../third_party/skia/relnotes/sksl_ganesh_dawn_removed.md FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h FILE: ../../../third_party/skia/src/gpu/gpu_workaround_list.txt FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.minified.sksl @@ -5760,7 +5761,6 @@ ORIGIN: ../../../third_party/skia/include/android/GrAHardwareBufferUtils.h + ../ ORIGIN: ../../../third_party/skia/include/core/SkTileMode.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/GrRecordingContext.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/include/gpu/dawn/GrDawnTypes.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/ports/SkCFObject.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkSLDefines.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h + ../../../third_party/skia/LICENSE @@ -5838,30 +5838,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.cpp + ../ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAttachment.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAttachment.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnBuffer.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnBuffer.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnCaps.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnCaps.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnGpu.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnGpu.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramBuilder.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramBuilder.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramDataManager.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramDataManager.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRenderTarget.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRenderTarget.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRingBuffer.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRingBuffer.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTexture.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTexture.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnUtil.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnUtil.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlDepthStencil.h + ../../../third_party/skia/LICENSE @@ -5903,7 +5879,6 @@ FILE: ../../../third_party/skia/include/android/GrAHardwareBufferUtils.h FILE: ../../../third_party/skia/include/core/SkTileMode.h FILE: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h FILE: ../../../third_party/skia/include/gpu/GrRecordingContext.h -FILE: ../../../third_party/skia/include/gpu/dawn/GrDawnTypes.h FILE: ../../../third_party/skia/include/ports/SkCFObject.h FILE: ../../../third_party/skia/include/private/SkSLDefines.h FILE: ../../../third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h @@ -5981,30 +5956,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAttachment.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAttachment.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnBuffer.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnBuffer.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnCaps.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnCaps.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnGpu.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnGpu.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramBuilder.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramBuilder.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramDataManager.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramDataManager.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRenderTarget.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRenderTarget.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRingBuffer.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRingBuffer.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTexture.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTexture.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnUtil.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnUtil.h FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.h FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlDepthStencil.h @@ -7433,7 +7384,6 @@ ORIGIN: ../../../third_party/skia/include/gpu/graphite/TextureInfo.h + ../../../ ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypes.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/chromium/Slug.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrDawnTypesPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrMockTypesPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/modules/canvaskit/paragraph_bindings_gen.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkEnumBitMask.h + ../../../third_party/skia/LICENSE @@ -7467,7 +7417,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.h + ../../ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/SurfaceFillContext.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/SurfaceFillContext.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTypesPriv.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/geometry/GrInnerFanTriangulator.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp + ../../../third_party/skia/LICENSE @@ -7653,7 +7602,6 @@ FILE: ../../../third_party/skia/include/gpu/graphite/TextureInfo.h FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypes.h FILE: ../../../third_party/skia/include/private/chromium/Slug.h -FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrDawnTypesPriv.h FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrMockTypesPriv.h FILE: ../../../third_party/skia/modules/canvaskit/paragraph_bindings_gen.cpp FILE: ../../../third_party/skia/src/base/SkEnumBitMask.h @@ -7687,7 +7635,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.h FILE: ../../../third_party/skia/src/gpu/ganesh/SurfaceFillContext.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/SurfaceFillContext.h FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTypesPriv.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrInnerFanTriangulator.h FILE: ../../../third_party/skia/src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp @@ -8631,8 +8578,6 @@ ORIGIN: ../../../third_party/skia/include/private/gpu/graphite/DawnTypesPriv.h + ORIGIN: ../../../third_party/skia/include/private/gpu/graphite/VulkanGraphiteTypesPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/gpu/vk/VulkanTypesPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.cpp + ../../../third_party/skia/LICENSE @@ -8648,8 +8593,6 @@ FILE: ../../../third_party/skia/include/private/gpu/graphite/DawnTypesPriv.h FILE: ../../../third_party/skia/include/private/gpu/graphite/VulkanGraphiteTypesPriv.h FILE: ../../../third_party/skia/include/private/gpu/vk/VulkanTypesPriv.h FILE: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp FILE: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp