From f79135b34a1856a11bcfdc2262897b3bdbd80f4e Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 23 May 2023 18:34:46 -0400 Subject: [PATCH] Roll Skia from 28946eda0f6d to 69f7860093b4 (6 revisions) (flutter/engine#42262) https://skia.googlesource.com/skia.git/+log/28946eda0f6d..69f7860093b4 2023-05-23 kjlubick@google.com Add placeholders to pdf.gni for SkJpegInfo 2023-05-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 8a3971e5e9c5 to cd2d20c6e4a3 (3 revisions) 2023-05-23 weiyuhuang@google.com Fix Line Break Rounding 2023-05-23 jacksongardner@google.com Create a `GrExternalTextureGenerator` that is usable outside skia. 2023-05-23 kjlubick@google.com Guard extra implementation of SkGetJpegInfo 2023-05-23 brianosman@google.com Avoid redefinition errors in Flutter If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC bdero@google.com,brianosman@google.com,rmistry@google.com,scroggo@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md --- DEPS | 2 +- engine/src/flutter/ci/licenses_golden/licenses_skia | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index c909f3501b4..3b8a2412928 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': '28946eda0f6db7cf668e27449fcd2b844a0cec69', + 'skia_revision': '69f7860093b4ec7971d1e3bee458847aa849c351', # 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/engine/src/flutter/ci/licenses_golden/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia index 8d7b30bff2a..e8f680e0bd0 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 50a4ec4d82965338b973156c18080051 +Signature: 89854d605d005376074eacce53975c50 ==================================================================================================== LIBRARY: etc1 @@ -395,6 +395,7 @@ 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/skimagegenerator_grexternaltexturegenerator.md FILE: ../../../third_party/skia/relnotes/sksurface_backend.md FILE: ../../../third_party/skia/relnotes/sksurface_namespace.md FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h @@ -8930,7 +8931,7 @@ ORIGIN: ../../../third_party/skia/include/codec/SkWebpDecoder.h + ../../../third ORIGIN: ../../../third_party/skia/include/core/SkEncodedImageFormat.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkICC.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkTextureCompressionType.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/include/gpu/ganesh/GrTextureGenerator.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/gpu/ganesh/GrExternalTextureGenerator.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/ganesh/SkImageGanesh.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/ganesh/mtl/SkSurfaceMetal.h + ../../../third_party/skia/LICENSE @@ -8938,6 +8939,7 @@ ORIGIN: ../../../third_party/skia/include/gpu/graphite/Image.h + ../../../third_ ORIGIN: ../../../third_party/skia/include/gpu/graphite/Surface.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/graphite/YUVABackendTextures.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/base/SkCPUTypes.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrTextureGenerator.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkBezierCurves.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkCubics.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkCubics.h + ../../../third_party/skia/LICENSE @@ -9062,7 +9064,7 @@ FILE: ../../../third_party/skia/include/codec/SkWebpDecoder.h FILE: ../../../third_party/skia/include/core/SkEncodedImageFormat.h FILE: ../../../third_party/skia/include/core/SkICC.h FILE: ../../../third_party/skia/include/core/SkTextureCompressionType.h -FILE: ../../../third_party/skia/include/gpu/ganesh/GrTextureGenerator.h +FILE: ../../../third_party/skia/include/gpu/ganesh/GrExternalTextureGenerator.h FILE: ../../../third_party/skia/include/gpu/ganesh/SkImageGanesh.h FILE: ../../../third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h FILE: ../../../third_party/skia/include/gpu/ganesh/mtl/SkSurfaceMetal.h @@ -9070,6 +9072,7 @@ FILE: ../../../third_party/skia/include/gpu/graphite/Image.h FILE: ../../../third_party/skia/include/gpu/graphite/Surface.h FILE: ../../../third_party/skia/include/gpu/graphite/YUVABackendTextures.h FILE: ../../../third_party/skia/include/private/base/SkCPUTypes.h +FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrTextureGenerator.h FILE: ../../../third_party/skia/src/base/SkBezierCurves.h FILE: ../../../third_party/skia/src/base/SkCubics.cpp FILE: ../../../third_party/skia/src/base/SkCubics.h