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

Commit 6d05ea4

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from ad85f404b97d to e2244ea470c0 (5 revisions) (#38096)
https://skia.googlesource.com/skia.git/+log/ad85f404b97d..e2244ea470c0 2022-12-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SK Tool from b55f242675c0 to 6a062f5dd011 2022-12-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from b36e337e8d94 to a9464755b535 (11 revisions) 2022-12-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Skia Infra from 35859e727fc0 to b55f242675c0 (11 revisions) 2022-12-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Dawn from 1e1834a4ce8b to 3c4fddf3e3a2 (9 revisions) 2022-12-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from ef116f5551fb to 80770ea57aff (7 revisions) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC djsollen@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
1 parent a588dbe commit 6d05ea4

File tree

3 files changed

+265
-29
lines changed

3 files changed

+265
-29
lines changed

‎DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': 'ad85f404b97da76c95da2ee3f6d81720d25bc4b3',
21+
'skia_revision': 'e2244ea470c0f543f76f16f53ae785232897d431',
2222

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

‎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: 71a7d60dc837b0a9c0997452b832aac2
1+
Signature: e110883334fda34f460cf233cc1d1fe7
22

33
UNUSED LICENSES:
44

‎sky/packages/sky_engine/LICENSE

Lines changed: 263 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4616,7 +4616,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
46164616
glfw
46174617

46184618
Copyright (c) 2002-2006 Marcus Geelnard
4619-
Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
4619+
4620+
Copyright (c) 2006-2019 Camilla Löwy
46204621

46214622
This software is provided 'as-is', without any express or implied
46224623
warranty. In no event will the authors be held liable for any damages
@@ -4641,6 +4642,102 @@ glfw
46414642

46424643
Copyright (c) 2002-2006 Marcus Geelnard
46434644
Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
4645+
4646+
This software is provided 'as-is', without any express or implied
4647+
warranty. In no event will the authors be held liable for any damages
4648+
arising from the use of this software.
4649+
4650+
Permission is granted to anyone to use this software for any purpose,
4651+
including commercial applications, and to alter it and redistribute it
4652+
freely, subject to the following restrictions:
4653+
4654+
1. The origin of this software must not be misrepresented; you must not
4655+
claim that you wrote the original software. If you use this software
4656+
in a product, an acknowledgment in the product documentation would
4657+
be appreciated but is not required.
4658+
4659+
2. Altered source versions must be plainly marked as such, and must not
4660+
be misrepresented as being the original software.
4661+
4662+
3. This notice may not be removed or altered from any source
4663+
distribution.
4664+
--------------------------------------------------------------------------------
4665+
glfw
4666+
4667+
Copyright (c) 2002-2006 Marcus Geelnard
4668+
Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
4669+
4670+
This software is provided 'as-is', without any express or implied
4671+
warranty. In no event will the authors be held liable for any damages
4672+
arising from the use of this software.
4673+
4674+
Permission is granted to anyone to use this software for any purpose,
4675+
including commercial applications, and to alter it and redistribute it
4676+
freely, subject to the following restrictions:
4677+
4678+
1. The origin of this software must not be misrepresented; you must not
4679+
claim that you wrote the original software. If you use this software
4680+
in a product, an acknowledgment in the product documentation would
4681+
be appreciated but is not required.
4682+
4683+
2. Altered source versions must be plainly marked as such, and must not
4684+
be misrepresented as being the original software.
4685+
4686+
3. This notice may not be removed or altered from any source
4687+
distribution.
4688+
--------------------------------------------------------------------------------
4689+
glfw
4690+
4691+
Copyright (c) 2002-2006 Marcus Geelnard
4692+
Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
4693+
4694+
This software is provided 'as-is', without any express or implied
4695+
warranty. In no event will the authors be held liable for any damages
4696+
arising from the use of this software.
4697+
4698+
Permission is granted to anyone to use this software for any purpose,
4699+
including commercial applications, and to alter it and redistribute it
4700+
freely, subject to the following restrictions:
4701+
4702+
1. The origin of this software must not be misrepresented; you must not
4703+
claim that you wrote the original software. If you use this software
4704+
in a product, an acknowledgment in the product documentation would
4705+
be appreciated but is not required.
4706+
4707+
2. Altered source versions must be plainly marked as such, and must not
4708+
be misrepresented as being the original software.
4709+
4710+
3. This notice may not be removed or altered from any source
4711+
distribution.
4712+
--------------------------------------------------------------------------------
4713+
glfw
4714+
4715+
Copyright (c) 2002-2006 Marcus Geelnard
4716+
Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
4717+
4718+
This software is provided 'as-is', without any express or implied
4719+
warranty. In no event will the authors be held liable for any damages
4720+
arising from the use of this software.
4721+
4722+
Permission is granted to anyone to use this software for any purpose,
4723+
including commercial applications, and to alter it and redistribute it
4724+
freely, subject to the following restrictions:
4725+
4726+
1. The origin of this software must not be misrepresented; you must not
4727+
claim that you wrote the original software. If you use this software
4728+
in a product, an acknowledgment in the product documentation would
4729+
be appreciated but is not required.
4730+
4731+
2. Altered source versions must be plainly marked as such, and must not
4732+
be misrepresented as being the original software.
4733+
4734+
3. This notice may not be removed or altered from any source
4735+
distribution.
4736+
--------------------------------------------------------------------------------
4737+
glfw
4738+
4739+
Copyright (c) 2002-2006 Marcus Geelnard
4740+
Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
46444741
Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
46454742

46464743
This software is provided 'as-is', without any express or implied
@@ -5162,7 +5259,30 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
51625259
--------------------------------------------------------------------------------
51635260
glfw
51645261

5165-
Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
5262+
Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
5263+
5264+
This software is provided 'as-is', without any express or implied
5265+
warranty. In no event will the authors be held liable for any damages
5266+
arising from the use of this software.
5267+
5268+
Permission is granted to anyone to use this software for any purpose,
5269+
including commercial applications, and to alter it and redistribute it
5270+
freely, subject to the following restrictions:
5271+
5272+
1. The origin of this software must not be misrepresented; you must not
5273+
claim that you wrote the original software. If you use this software
5274+
in a product, an acknowledgment in the product documentation would
5275+
be appreciated but is not required.
5276+
5277+
2. Altered source versions must be plainly marked as such, and must not
5278+
be misrepresented as being the original software.
5279+
5280+
3. This notice may not be removed or altered from any source
5281+
distribution.
5282+
--------------------------------------------------------------------------------
5283+
glfw
5284+
5285+
Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
51665286

51675287
This software is provided 'as-is', without any express or implied
51685288
warranty. In no event will the authors be held liable for any damages
@@ -5469,7 +5589,30 @@ freely, subject to the following restrictions:
54695589
--------------------------------------------------------------------------------
54705590
glfw
54715591

5472-
Copyright (c) 2009-2016 Camilla Löwy <elmindreda@glfw.org>
5592+
Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
5593+
5594+
This software is provided 'as-is', without any express or implied
5595+
warranty. In no event will the authors be held liable for any damages
5596+
arising from the use of this software.
5597+
5598+
Permission is granted to anyone to use this software for any purpose,
5599+
including commercial applications, and to alter it and redistribute it
5600+
freely, subject to the following restrictions:
5601+
5602+
1. The origin of this software must not be misrepresented; you must not
5603+
claim that you wrote the original software. If you use this software
5604+
in a product, an acknowledgment in the product documentation would
5605+
be appreciated but is not required.
5606+
5607+
2. Altered source versions must be plainly marked as such, and must not
5608+
be misrepresented as being the original software.
5609+
5610+
3. This notice may not be removed or altered from any source
5611+
distribution.
5612+
--------------------------------------------------------------------------------
5613+
glfw
5614+
5615+
Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
54735616
Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
54745617

54755618
This software is provided 'as-is', without any express or implied
@@ -5480,6 +5623,29 @@ Permission is granted to anyone to use this software for any purpose,
54805623
including commercial applications, and to alter it and redistribute it
54815624
freely, subject to the following restrictions:
54825625

5626+
1. The origin of this software must not be misrepresented; you must not
5627+
claim that you wrote the original software. If you use this software
5628+
in a product, an acknowledgment in the product documentation would
5629+
be appreciated but is not required.
5630+
5631+
2. Altered source versions must be plainly marked as such, and must not
5632+
be misrepresented as being the original software.
5633+
5634+
3. This notice may not be removed or altered from any source
5635+
distribution.
5636+
--------------------------------------------------------------------------------
5637+
glfw
5638+
5639+
Copyright (c) 2009-2021 Camilla Löwy <elmindreda@glfw.org>
5640+
5641+
This software is provided 'as-is', without any express or implied
5642+
warranty. In no event will the authors be held liable for any damages
5643+
arising from the use of this software.
5644+
5645+
Permission is granted to anyone to use this software for any purpose,
5646+
including commercial applications, and to alter it and redistribute it
5647+
freely, subject to the following restrictions:
5648+
54835649
1. The origin of this software must not be misrepresented; you must not
54845650
claim that you wrote the original software. If you use this software
54855651
in a product, an acknowledgment in the product documentation would
@@ -5684,29 +5850,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
56845850
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
56855851
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
56865852
--------------------------------------------------------------------------------
5687-
glfw
5688-
5689-
Copyright (c) 2010-2016 Camilla Löwy <elmindreda@glfw.org>
5690-
5691-
This software is provided 'as-is', without any express or implied
5692-
warranty. In no event will the authors be held liable for any damages
5693-
arising from the use of this software.
5694-
5695-
Permission is granted to anyone to use this software for any purpose,
5696-
including commercial applications, and to alter it and redistribute it
5697-
freely, subject to the following restrictions:
5698-
5699-
1. The origin of this software must not be misrepresented; you must not
5700-
claim that you wrote the original software. If you use this software
5701-
in a product, an acknowledgment in the product documentation would
5702-
be appreciated but is not required.
5703-
5704-
2. Altered source versions must be plainly marked as such, and must not
5705-
be misrepresented as being the original software.
5706-
5707-
3. This notice may not be removed or altered from any source
5708-
distribution.
5709-
--------------------------------------------------------------------------------
57105853
skia
57115854
vulkanmemoryallocator
57125855

@@ -6589,7 +6732,31 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
65896732
glfw
65906733

65916734
Copyright (c) 2016 Google Inc.
6592-
Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
6735+
Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
6736+
6737+
This software is provided 'as-is', without any express or implied
6738+
warranty. In no event will the authors be held liable for any damages
6739+
arising from the use of this software.
6740+
6741+
Permission is granted to anyone to use this software for any purpose,
6742+
including commercial applications, and to alter it and redistribute it
6743+
freely, subject to the following restrictions:
6744+
6745+
1. The origin of this software must not be misrepresented; you must not
6746+
claim that you wrote the original software. If you use this software
6747+
in a product, an acknowledgment in the product documentation would
6748+
be appreciated but is not required.
6749+
6750+
2. Altered source versions must be plainly marked as such, and must not
6751+
be misrepresented as being the original software.
6752+
6753+
3. This notice may not be removed or altered from any source
6754+
distribution.
6755+
--------------------------------------------------------------------------------
6756+
glfw
6757+
6758+
Copyright (c) 2016 Google Inc.
6759+
Copyright (c) 2016-2019 Camilla Löwy <elmindreda@glfw.org>
65936760

65946761
This software is provided 'as-is', without any express or implied
65956762
warranty. In no event will the authors be held liable for any damages
@@ -6656,6 +6823,29 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
66566823
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
66576824
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
66586825
--------------------------------------------------------------------------------
6826+
glfw
6827+
6828+
Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
6829+
6830+
This software is provided 'as-is', without any express or implied
6831+
warranty. In no event will the authors be held liable for any damages
6832+
arising from the use of this software.
6833+
6834+
Permission is granted to anyone to use this software for any purpose,
6835+
including commercial applications, and to alter it and redistribute it
6836+
freely, subject to the following restrictions:
6837+
6838+
1. The origin of this software must not be misrepresented; you must not
6839+
claim that you wrote the original software. If you use this software
6840+
in a product, an acknowledgment in the product documentation would
6841+
be appreciated but is not required.
6842+
6843+
2. Altered source versions must be plainly marked as such, and must not
6844+
be misrepresented as being the original software.
6845+
6846+
3. This notice may not be removed or altered from any source
6847+
distribution.
6848+
--------------------------------------------------------------------------------
66596849
expat
66606850

66616851
Copyright (c) 2017 José Gutiérrez de la Concha <jose@zeroc.com>
@@ -7120,6 +7310,29 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
71207310
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
71217311
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
71227312
--------------------------------------------------------------------------------
7313+
glfw
7314+
7315+
Copyright (c) 2021 Camilla Löwy <elmindreda@glfw.org>
7316+
7317+
This software is provided 'as-is', without any express or implied
7318+
warranty. In no event will the authors be held liable for any damages
7319+
arising from the use of this software.
7320+
7321+
Permission is granted to anyone to use this software for any purpose,
7322+
including commercial applications, and to alter it and redistribute it
7323+
freely, subject to the following restrictions:
7324+
7325+
1. The origin of this software must not be misrepresented; you must not
7326+
claim that you wrote the original software. If you use this software
7327+
in a product, an acknowledgment in the product documentation would
7328+
be appreciated but is not required.
7329+
7330+
2. Altered source versions must be plainly marked as such, and must not
7331+
be misrepresented as being the original software.
7332+
7333+
3. This notice may not be removed or altered from any source
7334+
distribution.
7335+
--------------------------------------------------------------------------------
71237336
expat
71247337
harfbuzz
71257338

@@ -7197,6 +7410,29 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
71977410
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
71987411
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
71997412
--------------------------------------------------------------------------------
7413+
glfw
7414+
7415+
Copyright (c) 2022 Camilla Löwy <elmindreda@glfw.org>
7416+
7417+
This software is provided 'as-is', without any express or implied
7418+
warranty. In no event will the authors be held liable for any damages
7419+
arising from the use of this software.
7420+
7421+
Permission is granted to anyone to use this software for any purpose,
7422+
including commercial applications, and to alter it and redistribute it
7423+
freely, subject to the following restrictions:
7424+
7425+
1. The origin of this software must not be misrepresented; you must not
7426+
claim that you wrote the original software. If you use this software
7427+
in a product, an acknowledgment in the product documentation would
7428+
be appreciated but is not required.
7429+
7430+
2. Altered source versions must be plainly marked as such, and must not
7431+
be misrepresented as being the original software.
7432+
7433+
3. This notice may not be removed or altered from any source
7434+
distribution.
7435+
--------------------------------------------------------------------------------
72007436
web_locale_keymap
72017437

72027438
Copyright (c) 2022 Google LLC

0 commit comments

Comments
 (0)