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 src/third_party/skia 3ebadcc98eab..056d543c91e0 (8 commits) (#18344)

Browse Source
This commit is contained in:
skia-flutter-autoroll 2020-05-13 14:52:02 -04:00 committed by GitHub
parent 9e3e3ba687
commit 80fa77eb35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -26,7 +26,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': '3ebadcc98eab1cfc2b64b7b11d5e7ae9884e89d0',
'skia_revision': '056d543c91e071a652f636fc48fc2c08be4e601c',
# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the

33
ci/licenses_golden/licenses_skia
View File

@ -1,4 +1,4 @@
Signature: 5d448e414dbbc4062eb8646fcaefbb18
Signature: 98dcf0534ceaffff69b59f39546463d7
UNUSED LICENSES:
@ -168,6 +168,31 @@ reason of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
====================================================================================================
====================================================================================================
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt
TYPE: LicenseType.mit
----------------------------------------------------------------------------------------------------
Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
====================================================================================================
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
USED LICENSES:
@ -7068,11 +7093,11 @@ all copies or substantial portions of the Materials.
====================================================================================================
LIBRARY: vulkanmemoryallocator
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
TYPE: LicenseType.mit
FILE: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
----------------------------------------------------------------------------------------------------
Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved.
Copyright (c) 2017-2020 Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@ -7092,4 +7117,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
====================================================================================================
Total license count: 57
Total license count: 58

2
sky/packages/sky_engine/LICENSE
View File

@ -12699,7 +12699,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
vulkanmemoryallocator
Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved.
Copyright (c) 2017-2020 Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal