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

Commit b51da31

Browse files
Roll Skia from c09761f57605 to 450f8565c7f3 (5 revisions) (#23851)
1 parent 475a234 commit b51da31

File tree

2 files changed

+49
-47
lines changed

2 files changed

+49
-47
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ vars = {
2727
'skia_git': 'https://skia.googlesource.com',
2828
# OCMock is for testing only so there is no google clone
2929
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
30-
'skia_revision': 'c09761f57605f408e473a73fbfe25a2636676bfa',
30+
'skia_revision': '450f8565c7f36205cc72e5f7f5e01eb024e8c38a',
3131

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

ci/licenses_golden/licenses_skia

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 4c6610f0219dce60017a88c13387fc5a
1+
Signature: 3813f6b2dde61189709dfb18f3ce2608
22

33
UNUSED LICENSES:
44

@@ -5459,6 +5459,53 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
54595459
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54605460
====================================================================================================
54615461

5462+
====================================================================================================
5463+
LIBRARY: skia
5464+
ORIGIN: ../../../third_party/skia/bench/TriangulatorBench.cpp + ../../../third_party/skia/LICENSE
5465+
TYPE: LicenseType.bsd
5466+
FILE: ../../../third_party/skia/bench/TriangulatorBench.cpp
5467+
FILE: ../../../third_party/skia/gm/crbug_1167277.cpp
5468+
FILE: ../../../third_party/skia/gm/lazytiling.cpp
5469+
FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h
5470+
FILE: ../../../third_party/skia/src/gpu/GrInnerFanTriangulator.h
5471+
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
5472+
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
5473+
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
5474+
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
5475+
FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
5476+
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h
5477+
----------------------------------------------------------------------------------------------------
5478+
Copyright 2021 Google LLC
5479+
5480+
Redistribution and use in source and binary forms, with or without
5481+
modification, are permitted provided that the following conditions are
5482+
met:
5483+
5484+
* Redistributions of source code must retain the above copyright
5485+
notice, this list of conditions and the following disclaimer.
5486+
5487+
* Redistributions in binary form must reproduce the above copyright
5488+
notice, this list of conditions and the following disclaimer in
5489+
the documentation and/or other materials provided with the
5490+
distribution.
5491+
5492+
* Neither the name of the copyright holder nor the names of its
5493+
contributors may be used to endorse or promote products derived
5494+
from this software without specific prior written permission.
5495+
5496+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5497+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5498+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5499+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5500+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5501+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5502+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5503+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5504+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5505+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5506+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5507+
====================================================================================================
5508+
54625509
====================================================================================================
54635510
LIBRARY: skia
54645511
ORIGIN: ../../../third_party/skia/docs/examples/50_percent_gray.cpp + ../../../third_party/skia/LICENSE
@@ -5982,51 +6029,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
59826029
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
59836030
====================================================================================================
59846031

5985-
====================================================================================================
5986-
LIBRARY: skia
5987-
ORIGIN: ../../../third_party/skia/gm/crbug_1167277.cpp + ../../../third_party/skia/LICENSE
5988-
TYPE: LicenseType.bsd
5989-
FILE: ../../../third_party/skia/gm/crbug_1167277.cpp
5990-
FILE: ../../../third_party/skia/gm/lazytiling.cpp
5991-
FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h
5992-
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
5993-
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
5994-
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
5995-
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
5996-
FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
5997-
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h
5998-
----------------------------------------------------------------------------------------------------
5999-
Copyright 2021 Google LLC
6000-
6001-
Redistribution and use in source and binary forms, with or without
6002-
modification, are permitted provided that the following conditions are
6003-
met:
6004-
6005-
* Redistributions of source code must retain the above copyright
6006-
notice, this list of conditions and the following disclaimer.
6007-
6008-
* Redistributions in binary form must reproduce the above copyright
6009-
notice, this list of conditions and the following disclaimer in
6010-
the documentation and/or other materials provided with the
6011-
distribution.
6012-
6013-
* Neither the name of the copyright holder nor the names of its
6014-
contributors may be used to endorse or promote products derived
6015-
from this software without specific prior written permission.
6016-
6017-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6018-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6019-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6020-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6021-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6022-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6023-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6024-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6025-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6026-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6027-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6028-
====================================================================================================
6029-
60306032
====================================================================================================
60316033
LIBRARY: skia
60326034
ORIGIN: ../../../third_party/skia/include/config/SkUserConfig.h + ../../../third_party/skia/LICENSE

0 commit comments

Comments
 (0)