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

Commit 83bb871

Browse files
Roll Skia from 27d827820c0a to 022636b15aff (6 revisions) (#25501)
1 parent be51bd3 commit 83bb871

File tree

3 files changed

+33
-18
lines changed

3 files changed

+33
-18
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': '27d827820c0afe30b0726cd5a0494638a11e05e6',
30+
'skia_revision': '022636b15aff6379c26c2bed114c92a5cdba3802',
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 1786b5ad6689d7c5b93529ebf9510ac4
1+
Signature: d9bdd622670a7784c9cd6461fc337f95
22

33
UNUSED LICENSES:
44

sky/packages/sky_engine/LICENSE

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4622,9 +4622,10 @@ met:
46224622
copyright notice, this list of conditions and the following
46234623
disclaimer in the documentation and/or other materials provided
46244624
with the distribution.
4625-
* Neither the name of Google Inc. nor the names of its
4625+
* Neither the name of Google LLC nor the names of its
46264626
contributors may be used to endorse or promote products derived
46274627
from this software without specific prior written permission.
4628+
46284629
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
46294630
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
46304631
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4651,9 +4652,10 @@ met:
46514652
copyright notice, this list of conditions and the following
46524653
disclaimer in the documentation and/or other materials provided
46534654
with the distribution.
4654-
* Neither the name of Google Inc. nor the names of its
4655+
* Neither the name of Google LLC nor the names of its
46554656
contributors may be used to endorse or promote products derived
46564657
from this software without specific prior written permission.
4658+
46574659
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
46584660
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
46594661
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4680,9 +4682,10 @@ met:
46804682
copyright notice, this list of conditions and the following
46814683
disclaimer in the documentation and/or other materials provided
46824684
with the distribution.
4683-
* Neither the name of Google Inc. nor the names of its
4685+
* Neither the name of Google LLC nor the names of its
46844686
contributors may be used to endorse or promote products derived
46854687
from this software without specific prior written permission.
4688+
46864689
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
46874690
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
46884691
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4709,9 +4712,10 @@ met:
47094712
copyright notice, this list of conditions and the following
47104713
disclaimer in the documentation and/or other materials provided
47114714
with the distribution.
4712-
* Neither the name of Google Inc. nor the names of its
4715+
* Neither the name of Google LLC nor the names of its
47134716
contributors may be used to endorse or promote products derived
47144717
from this software without specific prior written permission.
4718+
47154719
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
47164720
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
47174721
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4768,9 +4772,10 @@ met:
47684772
copyright notice, this list of conditions and the following
47694773
disclaimer in the documentation and/or other materials provided
47704774
with the distribution.
4771-
* Neither the name of Google Inc. nor the names of its
4775+
* Neither the name of Google LLC nor the names of its
47724776
contributors may be used to endorse or promote products derived
47734777
from this software without specific prior written permission.
4778+
47744779
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
47754780
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
47764781
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4797,9 +4802,10 @@ met:
47974802
copyright notice, this list of conditions and the following
47984803
disclaimer in the documentation and/or other materials provided
47994804
with the distribution.
4800-
* Neither the name of Google Inc. nor the names of its
4805+
* Neither the name of Google LLC nor the names of its
48014806
contributors may be used to endorse or promote products derived
48024807
from this software without specific prior written permission.
4808+
48034809
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
48044810
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
48054811
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4826,9 +4832,10 @@ met:
48264832
copyright notice, this list of conditions and the following
48274833
disclaimer in the documentation and/or other materials provided
48284834
with the distribution.
4829-
* Neither the name of Google Inc. nor the names of its
4835+
* Neither the name of Google LLC nor the names of its
48304836
contributors may be used to endorse or promote products derived
48314837
from this software without specific prior written permission.
4838+
48324839
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
48334840
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
48344841
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4855,9 +4862,10 @@ met:
48554862
copyright notice, this list of conditions and the following
48564863
disclaimer in the documentation and/or other materials provided
48574864
with the distribution.
4858-
* Neither the name of Google Inc. nor the names of its
4865+
* Neither the name of Google LLC nor the names of its
48594866
contributors may be used to endorse or promote products derived
48604867
from this software without specific prior written permission.
4868+
48614869
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
48624870
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
48634871
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4884,9 +4892,10 @@ met:
48844892
copyright notice, this list of conditions and the following
48854893
disclaimer in the documentation and/or other materials provided
48864894
with the distribution.
4887-
* Neither the name of Google Inc. nor the names of its
4895+
* Neither the name of Google LLC nor the names of its
48884896
contributors may be used to endorse or promote products derived
48894897
from this software without specific prior written permission.
4898+
48904899
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
48914900
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
48924901
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4913,9 +4922,10 @@ met:
49134922
copyright notice, this list of conditions and the following
49144923
disclaimer in the documentation and/or other materials provided
49154924
with the distribution.
4916-
* Neither the name of Google Inc. nor the names of its
4925+
* Neither the name of Google LLC nor the names of its
49174926
contributors may be used to endorse or promote products derived
49184927
from this software without specific prior written permission.
4928+
49194929
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
49204930
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
49214931
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4942,9 +4952,10 @@ met:
49424952
copyright notice, this list of conditions and the following
49434953
disclaimer in the documentation and/or other materials provided
49444954
with the distribution.
4945-
* Neither the name of Google Inc. nor the names of its
4955+
* Neither the name of Google LLC nor the names of its
49464956
contributors may be used to endorse or promote products derived
49474957
from this software without specific prior written permission.
4958+
49484959
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
49494960
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
49504961
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -4971,9 +4982,10 @@ met:
49714982
copyright notice, this list of conditions and the following
49724983
disclaimer in the documentation and/or other materials provided
49734984
with the distribution.
4974-
* Neither the name of Google Inc. nor the names of its
4985+
* Neither the name of Google LLC nor the names of its
49754986
contributors may be used to endorse or promote products derived
49764987
from this software without specific prior written permission.
4988+
49774989
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
49784990
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
49794991
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -5000,9 +5012,10 @@ met:
50005012
copyright notice, this list of conditions and the following
50015013
disclaimer in the documentation and/or other materials provided
50025014
with the distribution.
5003-
* Neither the name of Google Inc. nor the names of its
5015+
* Neither the name of Google LLC nor the names of its
50045016
contributors may be used to endorse or promote products derived
50055017
from this software without specific prior written permission.
5018+
50065019
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
50075020
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
50085021
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -5029,9 +5042,10 @@ met:
50295042
copyright notice, this list of conditions and the following
50305043
disclaimer in the documentation and/or other materials provided
50315044
with the distribution.
5032-
* Neither the name of Google Inc. nor the names of its
5045+
* Neither the name of Google LLC nor the names of its
50335046
contributors may be used to endorse or promote products derived
50345047
from this software without specific prior written permission.
5048+
50355049
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
50365050
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
50375051
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -5063,9 +5077,10 @@ met:
50635077
copyright notice, this list of conditions and the following
50645078
disclaimer in the documentation and/or other materials provided
50655079
with the distribution.
5066-
* Neither the name of Google Inc. nor the names of its
5080+
* Neither the name of Google LLC nor the names of its
50675081
contributors may be used to endorse or promote products derived
50685082
from this software without specific prior written permission.
5083+
50695084
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
50705085
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
50715086
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -9278,7 +9293,7 @@ met:
92789293
copyright notice, this list of conditions and the following
92799294
disclaimer in the documentation and/or other materials provided
92809295
with the distribution.
9281-
* Neither the name of Google Inc. nor the names of its
9296+
* Neither the name of Google LLC nor the names of its
92829297
contributors may be used to endorse or promote products derived
92839298
from this software without specific prior written permission.
92849299

0 commit comments

Comments
 (0)