Skip to content

Commit bf7cd79

Browse files
Roll Skia from 106a57b5ac3a to b21c4af0f670 (4 revisions) (flutter#30847)
1 parent 1205753 commit bf7cd79

File tree

3 files changed

+68
-3
lines changed

3 files changed

+68
-3
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': '106a57b5ac3a00a436bf2884f362adefa7fce4eb',
30+
'skia_revision': 'b21c4af0f67070e921187d8ce03925f4b8de6f58',
3131

3232
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
3333
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

ci/licenses_golden/licenses_skia

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: ff35b56e1c1f82c855fa4d21b4537db9
1+
Signature: 3fc28ecf772aa36cb61f70323b90297c
22

33
UNUSED LICENSES:
44

@@ -1281,6 +1281,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
12811281
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12821282
====================================================================================================
12831283

1284+
====================================================================================================
1285+
LIBRARY: skia
1286+
ORIGIN: ../../../third_party/skia/bazel/gcs_mirror/gcs_mirror.go + ../../../LICENSE
1287+
TYPE: LicenseType.bsd
1288+
FILE: ../../../third_party/skia/bazel/gcs_mirror/gcs_mirror.go
1289+
----------------------------------------------------------------------------------------------------
1290+
Copyright 2022 The Chromium Authors. All rights reserved.
1291+
1292+
Redistribution and use in source and binary forms, with or without
1293+
modification, are permitted provided that the following conditions are
1294+
met:
1295+
1296+
* Redistributions of source code must retain the above copyright
1297+
notice, this list of conditions and the following disclaimer.
1298+
* Redistributions in binary form must reproduce the above
1299+
copyright notice, this list of conditions and the following disclaimer
1300+
in the documentation and/or other materials provided with the
1301+
distribution.
1302+
* Neither the name of Google Inc. nor the names of its
1303+
contributors may be used to endorse or promote products derived from
1304+
this software without specific prior written permission.
1305+
1306+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1307+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1308+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1309+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1310+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1311+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1312+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1313+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1314+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1315+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1316+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1317+
====================================================================================================
1318+
12841319
====================================================================================================
12851320
LIBRARY: skia
12861321
ORIGIN: ../../../third_party/skia/bench/AAClipBench.cpp + ../../../third_party/skia/LICENSE
@@ -7830,4 +7865,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
78307865
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
78317866
THE SOFTWARE.
78327867
====================================================================================================
7833-
Total license count: 66
7868+
Total license count: 67

sky/packages/sky_engine/LICENSE

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

14772+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
14773+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
14774+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
14775+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
14776+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
14777+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
14778+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
14779+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
14780+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
14781+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
14782+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
14783+
--------------------------------------------------------------------------------
14784+
skia
14785+
14786+
Copyright 2022 The Chromium Authors. All rights reserved.
14787+
14788+
Redistribution and use in source and binary forms, with or without
14789+
modification, are permitted provided that the following conditions are
14790+
met:
14791+
14792+
* Redistributions of source code must retain the above copyright
14793+
notice, this list of conditions and the following disclaimer.
14794+
* Redistributions in binary form must reproduce the above
14795+
copyright notice, this list of conditions and the following disclaimer
14796+
in the documentation and/or other materials provided with the
14797+
distribution.
14798+
* Neither the name of Google Inc. nor the names of its
14799+
contributors may be used to endorse or promote products derived from
14800+
this software without specific prior written permission.
14801+
1477214802
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1477314803
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1477414804
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

0 commit comments

Comments
 (0)