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

Commit 6991dd9

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll src/third_party/skia b43cfa4..8121d27 (10 commits) (#16899)
1 parent 9c53993 commit 6991dd9

File tree

3 files changed

+129
-123
lines changed

3 files changed

+129
-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': 'b43cfa4d3f9630508d4fbda5dbd484046ebfabce',
29+
'skia_revision': '8121d27b297ce26cf6cd6c665463f49a34d769ba',
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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: f4fd9cad88e690b7a690873aefccfb63
1+
Signature: 351a994f16f75fa930e30fa8bb3143d1
22

33
UNUSED LICENSES:
44

@@ -1009,6 +1009,7 @@ FILE: ../../../third_party/skia/infra/bots/assets/gcloud_linux/VERSION
10091009
FILE: ../../../third_party/skia/infra/bots/assets/go/VERSION
10101010
FILE: ../../../third_party/skia/infra/bots/assets/go_win/VERSION
10111011
FILE: ../../../third_party/skia/infra/bots/assets/ios-dev-image-11.4/VERSION
1012+
FILE: ../../../third_party/skia/infra/bots/assets/ios-dev-image-12.4/VERSION
10121013
FILE: ../../../third_party/skia/infra/bots/assets/ios-dev-image-13.3/VERSION
10131014
FILE: ../../../third_party/skia/infra/bots/assets/linux_vulkan_sdk/VERSION
10141015
FILE: ../../../third_party/skia/infra/bots/assets/lottie-samples/VERSION
@@ -3924,7 +3925,8 @@ FILE: ../../../third_party/skia/gm/crbug_1041204.cpp
39243925
FILE: ../../../third_party/skia/gm/crbug_224618.cpp
39253926
FILE: ../../../third_party/skia/include/gpu/d3d/GrD3D12.h
39263927
FILE: ../../../third_party/skia/include/gpu/d3d/GrD3DBackendContext.h
3927-
FILE: ../../../third_party/skia/src/core/SkIDChangeListener.h
3928+
FILE: ../../../third_party/skia/include/private/SkIDChangeListener.h
3929+
FILE: ../../../third_party/skia/src/core/SkIDChangeListener.cpp
39283930
FILE: ../../../third_party/skia/src/core/SkVM_fwd.h
39293931
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCaps.cpp
39303932
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCaps.h

‎sky/packages/sky_engine/LICENSE

Lines changed: 124 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -5143,66 +5143,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
51435143
--------------------------------------------------------------------------------
51445144
fuchsia_sdk
51455145

5146-
Copyright 2015 The Fuchsia Authors. All rights reserved.
5147-
5148-
Redistribution and use in source and binary forms, with or without
5149-
modification, are permitted provided that the following conditions are
5150-
met:
5151-
5152-
* Redistributions of source code must retain the above copyright
5153-
notice, this list of conditions and the following disclaimer.
5154-
* Redistributions in binary form must reproduce the above
5155-
copyright notice, this list of conditions and the following disclaimer
5156-
in the documentation and/or other materials provided with the
5157-
distribution.
5158-
* Neither the name of Google Inc. nor the names of its
5159-
contributors may be used to endorse or promote products derived from
5160-
this software without specific prior written permission.
5161-
5162-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5163-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5164-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5165-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5166-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5167-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5168-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5169-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5170-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5171-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5172-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5173-
--------------------------------------------------------------------------------
5174-
fuchsia_sdk
5175-
5176-
Copyright 2016 The Fuchsia Authors. All rights reserved.
5177-
5178-
Redistribution and use in source and binary forms, with or without
5179-
modification, are permitted provided that the following conditions are
5180-
met:
5181-
5182-
* Redistributions of source code must retain the above copyright
5183-
notice, this list of conditions and the following disclaimer.
5184-
* Redistributions in binary form must reproduce the above
5185-
copyright notice, this list of conditions and the following disclaimer
5186-
in the documentation and/or other materials provided with the
5187-
distribution.
5188-
* Neither the name of Google Inc. nor the names of its
5189-
contributors may be used to endorse or promote products derived from
5190-
this software without specific prior written permission.
5191-
5192-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5193-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5194-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5195-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5196-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5197-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5198-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5199-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5200-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5201-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5202-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5203-
--------------------------------------------------------------------------------
5204-
fuchsia_sdk
5205-
52065146
Copyright 2016 The Fuchsia Authors. All rights reserved.
52075147
Copyright (c) 2009 Corey Tabaka
52085148

@@ -5234,66 +5174,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
52345174
--------------------------------------------------------------------------------
52355175
fuchsia_sdk
52365176

5237-
Copyright 2017 The Fuchsia Authors. All rights reserved.
5238-
5239-
Redistribution and use in source and binary forms, with or without
5240-
modification, are permitted provided that the following conditions are
5241-
met:
5242-
5243-
* Redistributions of source code must retain the above copyright
5244-
notice, this list of conditions and the following disclaimer.
5245-
* Redistributions in binary form must reproduce the above
5246-
copyright notice, this list of conditions and the following disclaimer
5247-
in the documentation and/or other materials provided with the
5248-
distribution.
5249-
* Neither the name of Google Inc. nor the names of its
5250-
contributors may be used to endorse or promote products derived from
5251-
this software without specific prior written permission.
5252-
5253-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5254-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5255-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5256-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5257-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5258-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5259-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5260-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5261-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5262-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5263-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5264-
--------------------------------------------------------------------------------
5265-
fuchsia_sdk
5266-
5267-
Copyright 2018 The Fuchsia Authors. All rights reserved.
5268-
5269-
Redistribution and use in source and binary forms, with or without
5270-
modification, are permitted provided that the following conditions are
5271-
met:
5272-
5273-
* Redistributions of source code must retain the above copyright
5274-
notice, this list of conditions and the following disclaimer.
5275-
* Redistributions in binary form must reproduce the above
5276-
copyright notice, this list of conditions and the following disclaimer
5277-
in the documentation and/or other materials provided with the
5278-
distribution.
5279-
* Neither the name of Google Inc. nor the names of its
5280-
contributors may be used to endorse or promote products derived from
5281-
this software without specific prior written permission.
5282-
5283-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5284-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5285-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5286-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5287-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5288-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5289-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5290-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5291-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5292-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5293-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5294-
--------------------------------------------------------------------------------
5295-
fuchsia_sdk
5296-
52975177
Copyright 2020 The Fuchsia Authors. All rights reserved.
52985178

52995179
Redistribution and use in source and binary forms, with or without
@@ -5690,6 +5570,130 @@ distribution.
56905570
contributors may be used to endorse or promote products derived from
56915571
this software without specific prior written permission.
56925572

5573+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5574+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5575+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5576+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5577+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5578+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5579+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5580+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5581+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5582+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5583+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5584+
--------------------------------------------------------------------------------
5585+
fuchsia_sdk
5586+
tonic
5587+
5588+
Copyright 2015 The Fuchsia Authors. All rights reserved.
5589+
5590+
Redistribution and use in source and binary forms, with or without
5591+
modification, are permitted provided that the following conditions are
5592+
met:
5593+
5594+
* Redistributions of source code must retain the above copyright
5595+
notice, this list of conditions and the following disclaimer.
5596+
* Redistributions in binary form must reproduce the above
5597+
copyright notice, this list of conditions and the following disclaimer
5598+
in the documentation and/or other materials provided with the
5599+
distribution.
5600+
* Neither the name of Google Inc. nor the names of its
5601+
contributors may be used to endorse or promote products derived from
5602+
this software without specific prior written permission.
5603+
5604+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5605+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5606+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5607+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5608+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5609+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5610+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5611+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5612+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5613+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5614+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5615+
--------------------------------------------------------------------------------
5616+
fuchsia_sdk
5617+
tonic
5618+
5619+
Copyright 2016 The Fuchsia Authors. All rights reserved.
5620+
5621+
Redistribution and use in source and binary forms, with or without
5622+
modification, are permitted provided that the following conditions are
5623+
met:
5624+
5625+
* Redistributions of source code must retain the above copyright
5626+
notice, this list of conditions and the following disclaimer.
5627+
* Redistributions in binary form must reproduce the above
5628+
copyright notice, this list of conditions and the following disclaimer
5629+
in the documentation and/or other materials provided with the
5630+
distribution.
5631+
* Neither the name of Google Inc. nor the names of its
5632+
contributors may be used to endorse or promote products derived from
5633+
this software without specific prior written permission.
5634+
5635+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5636+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5637+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5638+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5639+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5640+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5641+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5642+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5643+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5644+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5645+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5646+
--------------------------------------------------------------------------------
5647+
fuchsia_sdk
5648+
tonic
5649+
5650+
Copyright 2017 The Fuchsia Authors. All rights reserved.
5651+
5652+
Redistribution and use in source and binary forms, with or without
5653+
modification, are permitted provided that the following conditions are
5654+
met:
5655+
5656+
* Redistributions of source code must retain the above copyright
5657+
notice, this list of conditions and the following disclaimer.
5658+
* Redistributions in binary form must reproduce the above
5659+
copyright notice, this list of conditions and the following disclaimer
5660+
in the documentation and/or other materials provided with the
5661+
distribution.
5662+
* Neither the name of Google Inc. nor the names of its
5663+
contributors may be used to endorse or promote products derived from
5664+
this software without specific prior written permission.
5665+
5666+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5667+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5668+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5669+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5670+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5671+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5672+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5673+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5674+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5675+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5676+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5677+
--------------------------------------------------------------------------------
5678+
fuchsia_sdk
5679+
tonic
5680+
5681+
Copyright 2018 The Fuchsia Authors. All rights reserved.
5682+
5683+
Redistribution and use in source and binary forms, with or without
5684+
modification, are permitted provided that the following conditions are
5685+
met:
5686+
5687+
* Redistributions of source code must retain the above copyright
5688+
notice, this list of conditions and the following disclaimer.
5689+
* Redistributions in binary form must reproduce the above
5690+
copyright notice, this list of conditions and the following disclaimer
5691+
in the documentation and/or other materials provided with the
5692+
distribution.
5693+
* Neither the name of Google Inc. nor the names of its
5694+
contributors may be used to endorse or promote products derived from
5695+
this software without specific prior written permission.
5696+
56935697
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
56945698
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
56955699
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

0 commit comments

Comments
 (0)