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

Commit 08f39f7

Browse files
Roll Skia from ee9cb6aec35d to 9ff7b8d67559 (10 revisions) (#24148)
1 parent 62fbba5 commit 08f39f7

File tree

3 files changed

+35
-2
lines changed

3 files changed

+35
-2
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': 'ee9cb6aec35dbf25e76295cf6b20ebc7b95bd1b1',
30+
'skia_revision': '9ff7b8d675591ad2ca8bdbb9cfbd30cdef0f146c',
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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 4adf1ff9a764aa44446ebadcbf569e10
1+
Signature: eb0449cfccfed2cb80f91b56684b05a3
22

33
UNUSED LICENSES:
44

@@ -5980,6 +5980,7 @@ ORIGIN: ../../../third_party/skia/gm/colorspace.cpp + ../../../third_party/skia/
59805980
TYPE: LicenseType.bsd
59815981
FILE: ../../../third_party/skia/gm/colorspace.cpp
59825982
FILE: ../../../third_party/skia/gm/largeclippedpath.cpp
5983+
FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
59835984
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h
59845985
FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h
59855986
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp
@@ -7260,6 +7261,8 @@ FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp
72607261
FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.h
72617262
FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp
72627263
FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h
7264+
FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLFPs.cpp
7265+
FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLFPs.h
72637266
FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariable.cpp
72647267
----------------------------------------------------------------------------------------------------
72657268
Copyright 2021 Google LLC.

sky/packages/sky_engine/LICENSE

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,36 @@ distribution.
518518
contributors may be used to endorse or promote products derived from
519519
this software without specific prior written permission.
520520

521+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
522+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
523+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
524+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
525+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
526+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
527+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
528+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
529+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
530+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
531+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
532+
--------------------------------------------------------------------------------
533+
accessibility
534+
535+
Copyright (c) 2014 The Chromium Authors. All rights reserved.
536+
537+
Redistribution and use in source and binary forms, with or without
538+
modification, are permitted provided that the following conditions are
539+
met:
540+
541+
* Redistributions of source code must retain the above copyright
542+
notice, this list of conditions and the following disclaimer.
543+
* Redistributions in binary form must reproduce the above
544+
copyright notice, this list of conditions and the following disclaimer
545+
in the documentation and/or other materials provided with the
546+
distribution.
547+
* Neither the name of Google Inc. nor the names of its
548+
contributors may be used to endorse or promote products derived from
549+
this software without specific prior written permission.
550+
521551
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
522552
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
523553
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

0 commit comments

Comments
 (0)