DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Roll Skia from 9fe866174147 to a42c6192ff67 (12 revisions) (flutter/engine#24646)

Browse Source
This commit is contained in:
skia-flutter-autoroll 2021-02-25 21:16:01 -05:00 committed by GitHub
parent de68071d7f
commit cbd302e0e3
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -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

24
engine/src/flutter/ci/licenses_golden/licenses_skia
View File

@ -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