Skip to content

Commit 7f00e2f

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from a7b7964a237a to d64a3193cd49 (5 revisions) (flutter#23479)
1 parent effe47f commit 7f00e2f

File tree

3 files changed

+34
-123
lines changed

3 files changed

+34
-123
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': 'a7b7964a237a06feb74d1204bf87e16f094de63d',
29+
'skia_revision': 'd64a3193cd493e6ecabffd5061962f94c4e8cd54',
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 94154baed89e79733b994478b4f109c5
1+
Signature: 37bc646db72028c00ea32d037474afd7
22

33
UNUSED LICENSES:
44

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 32 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -518,96 +518,6 @@ 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) 2017 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-
551-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
552-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
553-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
554-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
555-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
556-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
557-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
558-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
559-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
560-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
561-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
562-
--------------------------------------------------------------------------------
563-
accessibility
564-
565-
Copyright (c) 2018 The Chromium Authors. All rights reserved.
566-
567-
Redistribution and use in source and binary forms, with or without
568-
modification, are permitted provided that the following conditions are
569-
met:
570-
571-
* Redistributions of source code must retain the above copyright
572-
notice, this list of conditions and the following disclaimer.
573-
* Redistributions in binary form must reproduce the above
574-
copyright notice, this list of conditions and the following disclaimer
575-
in the documentation and/or other materials provided with the
576-
distribution.
577-
* Neither the name of Google Inc. nor the names of its
578-
contributors may be used to endorse or promote products derived from
579-
this software without specific prior written permission.
580-
581-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
582-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
583-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
584-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
585-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
586-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
587-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
588-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
589-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
590-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
591-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
592-
--------------------------------------------------------------------------------
593-
accessibility
594-
595-
Copyright (c) 2019 The Chromium Authors. All rights reserved.
596-
597-
Redistribution and use in source and binary forms, with or without
598-
modification, are permitted provided that the following conditions are
599-
met:
600-
601-
* Redistributions of source code must retain the above copyright
602-
notice, this list of conditions and the following disclaimer.
603-
* Redistributions in binary form must reproduce the above
604-
copyright notice, this list of conditions and the following disclaimer
605-
in the documentation and/or other materials provided with the
606-
distribution.
607-
* Neither the name of Google Inc. nor the names of its
608-
contributors may be used to endorse or promote products derived from
609-
this software without specific prior written permission.
610-
611521
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
612522
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
613523
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -782,6 +692,38 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
782692
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
783693
--------------------------------------------------------------------------------
784694
accessibility
695+
engine
696+
gpu
697+
tonic
698+
txt
699+
700+
Copyright 2013 The Flutter Authors. All rights reserved.
701+
702+
Redistribution and use in source and binary forms, with or without modification,
703+
are permitted provided that the following conditions are met:
704+
705+
* Redistributions of source code must retain the above copyright
706+
notice, this list of conditions and the following disclaimer.
707+
* Redistributions in binary form must reproduce the above
708+
copyright notice, this list of conditions and the following
709+
disclaimer in the documentation and/or other materials provided
710+
with the distribution.
711+
* Neither the name of Google Inc. nor the names of its
712+
contributors may be used to endorse or promote products derived
713+
from this software without specific prior written permission.
714+
715+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
716+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
717+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
718+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
719+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
720+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
721+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
722+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
723+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
724+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
725+
--------------------------------------------------------------------------------
726+
accessibility
785727
fuchsia_sdk
786728
skia
787729
zlib
@@ -5208,37 +5150,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
52085150
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
52095151
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
52105152
--------------------------------------------------------------------------------
5211-
engine
5212-
gpu
5213-
tonic
5214-
txt
5215-
5216-
Copyright 2013 The Flutter Authors. All rights reserved.
5217-
5218-
Redistribution and use in source and binary forms, with or without modification,
5219-
are permitted provided that the following conditions are met:
5220-
5221-
* Redistributions of source code must retain the above copyright
5222-
notice, this list of conditions and the following disclaimer.
5223-
* Redistributions in binary form must reproduce the above
5224-
copyright notice, this list of conditions and the following
5225-
disclaimer in the documentation and/or other materials provided
5226-
with the distribution.
5227-
* Neither the name of Google Inc. nor the names of its
5228-
contributors may be used to endorse or promote products derived
5229-
from this software without specific prior written permission.
5230-
5231-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
5232-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
5233-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
5234-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
5235-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
5236-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
5237-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
5238-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5239-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
5240-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5241-
--------------------------------------------------------------------------------
52425153
ffx_spd
52435154

52445155
Copyright (c) 2017-2019 Advanced Micro Devices, Inc. All rights reserved.

0 commit comments

Comments
 (0)