Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 6ff91a1

Browse files
Roll src/third_party/skia 3ebadcc..25dc7ca (6 commits)
https://skia.googlesource.com/skia.git/+log/3ebadcc98eab..25dc7ca1f314 git log 3ebadcc..25dc7ca --date=short --first-parent --format='%ad %ae %s' 2020-05-13 [email protected] In SkTaskGroup, move the function in case it has heap-allocated storage 2020-05-13 [email protected] Update AMD vulkan memory allocator. 2020-05-13 [email protected] Update Go Deps 2020-05-13 [email protected] Roll third_party/externals/angle2 9823d86..3b82fdc (14 commits) 2020-05-13 [email protected] Roll third_party/externals/swiftshader d9ba4b7dd30b..64da65bd1bd5 (1 commits) 2020-05-13 [email protected] Roll ../src 63c884f8e9c5..e334ec41436b (468 commits) Created with: gclient setdep -r src/third_party/skia@25dc7ca1f314 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 [email protected] on the revert to ensure that a human is aware of the problem. 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/+/master/autoroll/README.md Bug: None Tbr: [email protected]
1 parent 429beae commit 6ff91a1

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ vars = {
2626
'skia_git': 'https://skia.googlesource.com',
2727
# OCMock is for testing only so there is no google clone
2828
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
29-
'skia_revision': '3ebadcc98eab1cfc2b64b7b11d5e7ae9884e89d0',
29+
'skia_revision': '25dc7ca1f314bfe250f32093d8c71b4d21fcee86',
3030

3131
# When updating the Dart revision, ensure that all entries that are
3232
# dependencies of Dart are also updated to match the entries in the

ci/licenses_golden/licenses_skia

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 5d448e414dbbc4062eb8646fcaefbb18
1+
Signature: aff1c228dfcbdc6f1f1f71927cb6e258
22

33
UNUSED LICENSES:
44

@@ -168,6 +168,31 @@ reason of your accepting any such warranty or additional liability.
168168

169169
END OF TERMS AND CONDITIONS
170170
====================================================================================================
171+
172+
====================================================================================================
173+
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt
174+
TYPE: LicenseType.mit
175+
----------------------------------------------------------------------------------------------------
176+
Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved.
177+
178+
Permission is hereby granted, free of charge, to any person obtaining a copy
179+
of this software and associated documentation files (the "Software"), to deal
180+
in the Software without restriction, including without limitation the rights
181+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
182+
copies of the Software, and to permit persons to whom the Software is
183+
furnished to do so, subject to the following conditions:
184+
185+
The above copyright notice and this permission notice shall be included in
186+
all copies or substantial portions of the Software.
187+
188+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
189+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
190+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
191+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
192+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
193+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
194+
THE SOFTWARE.
195+
====================================================================================================
171196
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
172197
USED LICENSES:
173198

@@ -7068,11 +7093,11 @@ all copies or substantial portions of the Materials.
70687093

70697094
====================================================================================================
70707095
LIBRARY: vulkanmemoryallocator
7071-
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt
7096+
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
70727097
TYPE: LicenseType.mit
70737098
FILE: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
70747099
----------------------------------------------------------------------------------------------------
7075-
Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved.
7100+
Copyright (c) 2017-2020 Advanced Micro Devices, Inc. All rights reserved.
70767101

70777102
Permission is hereby granted, free of charge, to any person obtaining a copy
70787103
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,
70927117
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
70937118
THE SOFTWARE.
70947119
====================================================================================================
7095-
Total license count: 57
7120+
Total license count: 58

sky/packages/sky_engine/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12699,7 +12699,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1269912699
--------------------------------------------------------------------------------
1270012700
vulkanmemoryallocator
1270112701

12702-
Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved.
12702+
Copyright (c) 2017-2020 Advanced Micro Devices, Inc. All rights reserved.
1270312703

1270412704
Permission is hereby granted, free of charge, to any person obtaining a copy
1270512705
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)