From cbd302e0e331eee5bf552d6e43d12c8f9f6bfbc8 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Thu, 25 Feb 2021 21:16:01 -0500 Subject: [PATCH] Roll Skia from 9fe866174147 to a42c6192ff67 (12 revisions) (flutter/engine#24646) --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 24 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/DEPS b/DEPS index 5ce1e24f4c7..524cedc06a1 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': '9fe86617414798abf0c58bdbbd6f1cb56535c0b6', + 'skia_revision': 'a42c6192ff6794a75632dba0aab322b277c34c33', # 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/engine/src/flutter/ci/licenses_golden/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia index 1a4645235cf..36f599dbdfa 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 4326050828976164ee30a066c9a4da92 +Signature: 2cb5271a87fdd68fbeb03e7ee5b7f614 UNUSED LICENSES: @@ -5218,6 +5218,7 @@ FILE: ../../../third_party/skia/src/sksl/SkSLDefinitionMap.h FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h FILE: ../../../third_party/skia/src/sksl/SkSLOperators.cpp FILE: ../../../third_party/skia/src/sksl/SkSLOperators.h +FILE: ../../../third_party/skia/src/sksl/ir/SkSLForStatement.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLIfStatement.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwizzle.cpp @@ -5967,15 +5968,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzDDLThreading.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp -FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp -FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp -FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp -FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkDescriptorDeserialize.cpp +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzDDLThreading.cpp +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkParagraph.cpp ---------------------------------------------------------------------------------------------------- -Copyright 2019 Google, LLC +Copyright 2021 Google, LLC Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -6008,11 +6006,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkParagraph.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkParagraph.cpp +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkDescriptorDeserialize.cpp ---------------------------------------------------------------------------------------------------- -Copyright 2021 Google, LLC +Copyright 2019 Google, LLC Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are