diff --git a/DEPS b/DEPS index 20a2affe0ed96..7b17235b2bbaa 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': '15d36b15bca1de4a28e7feafbf282d6632405eb4', + 'skia_revision': '9423a8a0fc2d8b93b4a6a909d1955c04f4be06ae', # 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 4a1e7c293452b..d3535e126cddc 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2481,6 +2481,8 @@ ../../../third_party/skia/include/BUILD.bazel ../../../third_party/skia/include/OWNERS ../../../third_party/skia/include/android/BUILD.bazel +../../../third_party/skia/include/base/BUILD.bazel +../../../third_party/skia/include/base/README.md ../../../third_party/skia/include/codec/BUILD.bazel ../../../third_party/skia/include/config/BUILD.bazel ../../../third_party/skia/include/core/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 9b39dd2106566..bb7f3149087e2 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: bfb6bf0a5ad2b5218f7ecece4a305148 +Signature: 83a3161dc427b108aedd5013fc2530c8 ==================================================================================================== LIBRARY: etc1 @@ -7359,7 +7359,8 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.cpp + ../.. ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/Buffer.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/Buffer.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/graphite/DrawBufferManager.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/graphite/BufferManager.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/graphite/BufferManager.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/DrawBufferManager.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBlitCommandEncoder.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBuffer.h + ../../../third_party/skia/LICENSE @@ -7445,7 +7446,8 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.h FILE: ../../../third_party/skia/src/gpu/graphite/Buffer.cpp FILE: ../../../third_party/skia/src/gpu/graphite/Buffer.h -FILE: ../../../third_party/skia/src/gpu/graphite/DrawBufferManager.cpp +FILE: ../../../third_party/skia/src/gpu/graphite/BufferManager.cpp +FILE: ../../../third_party/skia/src/gpu/graphite/BufferManager.h FILE: ../../../third_party/skia/src/gpu/graphite/DrawBufferManager.h FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBlitCommandEncoder.h FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBuffer.h @@ -8272,6 +8274,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LIBRARY: skia ORIGIN: ../../../third_party/skia/gm/bug12866.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/crbug_1313579.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/base/SkAPI.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/base/SkAlign.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/base/SkAssert.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/base/SkAttributes.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/base/SkDebug.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/base/SkFeatures.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/base/SkLoadUserConfig.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkAlphaType.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkCapabilities.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkColorType.h + ../../../third_party/skia/LICENSE @@ -8285,6 +8294,7 @@ ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlUtils.h + ../../.. ORIGIN: ../../../third_party/skia/include/gpu/graphite/vk/VulkanGraphiteUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/vk/VulkanBackendContext.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkAlignedStorage.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/private/SkPathEnums.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkTypeTraits.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/sksl/SkSLVersion.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp + ../../../third_party/skia/LICENSE @@ -8484,6 +8494,13 @@ ORIGIN: ../../../third_party/skia/src/utils/SkTestCanvas.h + ../../../third_part TYPE: LicenseType.bsd FILE: ../../../third_party/skia/gm/bug12866.cpp FILE: ../../../third_party/skia/gm/crbug_1313579.cpp +FILE: ../../../third_party/skia/include/base/SkAPI.h +FILE: ../../../third_party/skia/include/base/SkAlign.h +FILE: ../../../third_party/skia/include/base/SkAssert.h +FILE: ../../../third_party/skia/include/base/SkAttributes.h +FILE: ../../../third_party/skia/include/base/SkDebug.h +FILE: ../../../third_party/skia/include/base/SkFeatures.h +FILE: ../../../third_party/skia/include/base/SkLoadUserConfig.h FILE: ../../../third_party/skia/include/core/SkAlphaType.h FILE: ../../../third_party/skia/include/core/SkCapabilities.h FILE: ../../../third_party/skia/include/core/SkColorType.h @@ -8497,6 +8514,7 @@ FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlUtils.h FILE: ../../../third_party/skia/include/gpu/graphite/vk/VulkanGraphiteUtils.h FILE: ../../../third_party/skia/include/gpu/vk/VulkanBackendContext.h FILE: ../../../third_party/skia/include/private/SkAlignedStorage.h +FILE: ../../../third_party/skia/include/private/SkPathEnums.h FILE: ../../../third_party/skia/include/private/SkTypeTraits.h FILE: ../../../third_party/skia/include/sksl/SkSLVersion.h FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp