Skip to content

Commit 7fea936

Browse files
Roll src/third_party/skia cc21d0c1f2ce..116b33e8ab21 (3 commits) (flutter#16466)
1 parent b0b0ed8 commit 7fea936

File tree

2 files changed

+42
-40
lines changed

2 files changed

+42
-40
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': 'cc21d0c1f2ce38a8d903a1a8f88d096ecf30604e',
29+
'skia_revision': '116b33e8ab2173f59d0244836740b42c63b29130',
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: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 8a324a172f9ed19ea8547c59d67640a5
1+
Signature: 25ebda78b811d12660c00b15a7ce8dc8
22

33
UNUSED LICENSES:
44

@@ -5608,7 +5608,44 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
56085608

56095609
====================================================================================================
56105610
LIBRARY: skia
5611-
ORIGIN: ../../../third_party/skia/gm/3d.cpp + ../../../third_party/skia/LICENSE
5611+
ORIGIN: ../../../third_party/skia/gm/circles.cpp + ../../../third_party/skia/LICENSE
5612+
TYPE: LicenseType.bsd
5613+
FILE: ../../../third_party/skia/gm/circles.cpp
5614+
----------------------------------------------------------------------------------------------------
5615+
Copyright 2012 Intel Inc.
5616+
5617+
Redistribution and use in source and binary forms, with or without
5618+
modification, are permitted provided that the following conditions are
5619+
met:
5620+
5621+
* Redistributions of source code must retain the above copyright
5622+
notice, this list of conditions and the following disclaimer.
5623+
5624+
* Redistributions in binary form must reproduce the above copyright
5625+
notice, this list of conditions and the following disclaimer in
5626+
the documentation and/or other materials provided with the
5627+
distribution.
5628+
5629+
* Neither the name of the copyright holder nor the names of its
5630+
contributors may be used to endorse or promote products derived
5631+
from this software without specific prior written permission.
5632+
5633+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5634+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5635+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5636+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5637+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5638+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5639+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5640+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5641+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5642+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5643+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5644+
====================================================================================================
5645+
5646+
====================================================================================================
5647+
LIBRARY: skia
5648+
ORIGIN: ../../../third_party/skia/gm/verifiers/gmverifier.cpp + ../../../third_party/skia/LICENSE
56125649
TYPE: LicenseType.bsd
56135650
FILE: ../../../third_party/skia/gm/3d.cpp
56145651
FILE: ../../../third_party/skia/gm/bc1_transparency.cpp
@@ -5617,6 +5654,8 @@ FILE: ../../../third_party/skia/gm/compressed_textures.cpp
56175654
FILE: ../../../third_party/skia/gm/exoticformats.cpp
56185655
FILE: ../../../third_party/skia/gm/skbug_9819.cpp
56195656
FILE: ../../../third_party/skia/gm/strokerect_anisotropic.cpp
5657+
FILE: ../../../third_party/skia/gm/verifiers/gmverifier.cpp
5658+
FILE: ../../../third_party/skia/gm/verifiers/gmverifier.h
56205659
FILE: ../../../third_party/skia/include/private/SkM44.h
56215660
FILE: ../../../third_party/skia/modules/skottie/src/Adapter.h
56225661
FILE: ../../../third_party/skia/modules/skottie/src/Animator.cpp
@@ -5677,43 +5716,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
56775716
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
56785717
====================================================================================================
56795718

5680-
====================================================================================================
5681-
LIBRARY: skia
5682-
ORIGIN: ../../../third_party/skia/gm/circles.cpp + ../../../third_party/skia/LICENSE
5683-
TYPE: LicenseType.bsd
5684-
FILE: ../../../third_party/skia/gm/circles.cpp
5685-
----------------------------------------------------------------------------------------------------
5686-
Copyright 2012 Intel Inc.
5687-
5688-
Redistribution and use in source and binary forms, with or without
5689-
modification, are permitted provided that the following conditions are
5690-
met:
5691-
5692-
* Redistributions of source code must retain the above copyright
5693-
notice, this list of conditions and the following disclaimer.
5694-
5695-
* Redistributions in binary form must reproduce the above copyright
5696-
notice, this list of conditions and the following disclaimer in
5697-
the documentation and/or other materials provided with the
5698-
distribution.
5699-
5700-
* Neither the name of the copyright holder nor the names of its
5701-
contributors may be used to endorse or promote products derived
5702-
from this software without specific prior written permission.
5703-
5704-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5705-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5706-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5707-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5708-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5709-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5710-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5711-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5712-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5713-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5714-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5715-
====================================================================================================
5716-
57175719
====================================================================================================
57185720
LIBRARY: skia
57195721
ORIGIN: ../../../third_party/skia/include/config/SkUserConfig.h + ../../../third_party/skia/LICENSE

0 commit comments

Comments
 (0)