From b593f900894145c011382a615ed570d7d7933b2a Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 26 Jan 2021 20:04:02 -0500 Subject: [PATCH] Roll Skia from a6bff0c3446b to 6742d13cbe2e (9 revisions) (#23971) --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 0575170e2..c932cd06b 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': 'a6bff0c3446bb8f85f61aac7746f5810c3179392', + 'skia_revision': '6742d13cbe2e8b92ce0f5e109162b8f9647f7ae1', # 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 a9f860ae2..d2f70988d 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: e3f1bc2314feae640582f81db921fb53 +Signature: e1ec42beee5a2a94a6314c22864c8cd7 UNUSED LICENSES: @@ -5246,6 +5246,8 @@ FILE: ../../../third_party/skia/gm/lazytiling.cpp FILE: ../../../third_party/skia/gm/runtimeeffectimage.cpp FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h FILE: ../../../third_party/skia/src/gpu/GrInnerFanTriangulator.h +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/sksl/SkSLBuiltinTypes.cpp @@ -5975,7 +5977,9 @@ LIBRARY: skia ORIGIN: ../../../third_party/skia/gm/colorspace.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/skia/gm/colorspace.cpp +FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h +FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h @@ -7240,8 +7244,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/tessellate/GrPathStencilFillOp.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd +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/sksl/SkSLMangler.cpp -- GitLab