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

Commit b230adb

Browse files
Roll src/third_party/skia 470f063..ded4370 (6 commits) (#16891)
1 parent df94213 commit b230adb

File tree

3 files changed

+69
-3
lines changed

3 files changed

+69
-3
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': '470f0637aeea7222f1216b22a39cf71d28575dc4',
29+
'skia_revision': 'ded437003d0e1ad5581b07d3d2afadccc68dc5b2',
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: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: fc2bd6b9ecc2cabd5149efe1981a3059
1+
Signature: 74fb527eceeeacc6cded0eda3baae3b9
22

33
UNUSED LICENSES:
44

@@ -3924,6 +3924,7 @@ FILE: ../../../third_party/skia/gm/crbug_1041204.cpp
39243924
FILE: ../../../third_party/skia/gm/crbug_224618.cpp
39253925
FILE: ../../../third_party/skia/include/gpu/d3d/GrD3D12.h
39263926
FILE: ../../../third_party/skia/include/gpu/d3d/GrD3DBackendContext.h
3927+
FILE: ../../../third_party/skia/src/core/SkIDChangeListener.h
39273928
FILE: ../../../third_party/skia/src/core/SkVM_fwd.h
39283929
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCaps.cpp
39293930
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCaps.h
@@ -6258,6 +6259,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
62586259
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
62596260
====================================================================================================
62606261

6262+
====================================================================================================
6263+
LIBRARY: skia
6264+
ORIGIN: ../../../third_party/skia/infra/bots/gen_tasks_logic/dm_flags.go + ../../../LICENSE
6265+
TYPE: LicenseType.bsd
6266+
FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/dm_flags.go
6267+
----------------------------------------------------------------------------------------------------
6268+
Copyright 2020 The Chromium Authors. All rights reserved.
6269+
6270+
Redistribution and use in source and binary forms, with or without
6271+
modification, are permitted provided that the following conditions are
6272+
met:
6273+
6274+
* Redistributions of source code must retain the above copyright
6275+
notice, this list of conditions and the following disclaimer.
6276+
* Redistributions in binary form must reproduce the above
6277+
copyright notice, this list of conditions and the following disclaimer
6278+
in the documentation and/or other materials provided with the
6279+
distribution.
6280+
* Neither the name of Google Inc. nor the names of its
6281+
contributors may be used to endorse or promote products derived from
6282+
this software without specific prior written permission.
6283+
6284+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6285+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6286+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6287+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6288+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6289+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6290+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6291+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6292+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6293+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6294+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6295+
====================================================================================================
6296+
62616297
====================================================================================================
62626298
LIBRARY: skia
62636299
ORIGIN: ../../../third_party/skia/infra/bots/gen_tasks_logic/gen_tasks_logic.go + ../../../LICENSE
@@ -7005,4 +7041,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
70057041
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
70067042
THE SOFTWARE.
70077043
====================================================================================================
7008-
Total license count: 56
7044+
Total license count: 57

sky/packages/sky_engine/LICENSE

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12859,6 +12859,36 @@ met:
1285912859
contributors may be used to endorse or promote products derived
1286012860
from this software without specific prior written permission.
1286112861

12862+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
12863+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
12864+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
12865+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
12866+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
12867+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
12868+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
12869+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
12870+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
12871+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
12872+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12873+
--------------------------------------------------------------------------------
12874+
skia
12875+
12876+
Copyright 2020 The Chromium Authors. All rights reserved.
12877+
12878+
Redistribution and use in source and binary forms, with or without
12879+
modification, are permitted provided that the following conditions are
12880+
met:
12881+
12882+
* Redistributions of source code must retain the above copyright
12883+
notice, this list of conditions and the following disclaimer.
12884+
* Redistributions in binary form must reproduce the above
12885+
copyright notice, this list of conditions and the following disclaimer
12886+
in the documentation and/or other materials provided with the
12887+
distribution.
12888+
* Neither the name of Google Inc. nor the names of its
12889+
contributors may be used to endorse or promote products derived from
12890+
this software without specific prior written permission.
12891+
1286212892
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1286312893
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1286412894
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

0 commit comments

Comments
 (0)