Roll Skia from c098e3c5d932 to e3c0b382b072 (12 revisions) (#37875)
https://skia.googlesource.com/skia.git/+log/c098e3c5d932..e3c0b382b072
2022-11-23 bungeman@google.com Move expat LICENSE file up to third_party/expat
2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from bd2c589d0d34 to 46af29f17d19 (1 revision)
2022-11-23 bungeman@google.com Roll Expat from a28238bd to 441f98d0 (351 commits)
2022-11-23 bungeman@google.com Add roll script for expat
2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SK Tool from 20e090196af1 to e8d7a0b58143
2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from 356b2a590e11 to 27727e501aee (13 revisions)
2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Skia Infra from 8d5d6fd45a13 to 20e090196af1 (2 revisions)
2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Dawn from edbeeee285d8 to c7e156fb7b8f (27 revisions)
2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 96f4fdc41b84 to bd2c589d0d34 (5 revisions)
2022-11-22 armansito@google.com [sksl] Support all compute stage inputs
2022-11-22 armansito@google.com [sksl] Reduce memory-order constraints of workgroupBarrier()
2022-11-22 brianosman@google.com Simplify the SkColor4fXformer signature
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 jmbetancourt@google.com,kaushikiska@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
diff --git a/DEPS b/DEPS
index 70e96bb..deb1734 100644
--- a/DEPS
+++ b/DEPS
@@ -18,7 +18,7 @@
'llvm_git': 'https://llvm.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
- 'skia_revision': 'c098e3c5d932798e0381ae452914e2658f20840c',
+ 'skia_revision': 'e3c0b382b0727cfc8a8e7fa0529aee9c4bca3bcd',
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia
index ed2bb74..eb0bf98 100644
--- a/ci/licenses_golden/licenses_skia
+++ b/ci/licenses_golden/licenses_skia
@@ -1,4 +1,4 @@
-Signature: b50042e33d2c3c1d6c6cf89266e8a205
+Signature: ede9289602ed750a87220aeab1ca13ca
UNUSED LICENSES:
@@ -1334,9 +1334,13 @@
====================================================================================================
====================================================================================================
+LIBRARY: expat
LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/skia/third_party/expat/include/expat_config/LICENSE
+ORIGIN: ../../../third_party/skia/third_party/expat/LICENSE
TYPE: LicenseType.bsd
+FILE: ../../../third_party/skia/third_party/expat/0001-Do-not-claim-getrandom.patch
+FILE: ../../../third_party/skia/third_party/expat/0002-Do-not-claim-arc4random_buf.patch
+FILE: ../../../third_party/skia/third_party/expat/include/expat_config/expat_config.h
FILE: ../../../third_party/skia/third_party/harfbuzz/config-override.h
----------------------------------------------------------------------------------------------------
Copyright (c) 2021 Google Inc. All rights reserved.
@@ -6975,41 +6979,6 @@
====================================================================================================
====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/skia/third_party/expat/include/expat_config/expat_config.h + ../../../third_party/skia/third_party/expat/include/expat_config/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/third_party/expat/include/expat_config/expat_config.h
-----------------------------------------------------------------------------------------------------
-Copyright 2021 Google Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/bench/graphite/IntersectionTreeBench.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
@@ -8005,4 +7974,4 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
-Total license count: 68
+Total license count: 67
diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE
index edb758e..8826f70 100644
--- a/sky/packages/sky_engine/LICENSE
+++ b/sky/packages/sky_engine/LICENSE
@@ -7180,6 +7180,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
+expat
harfbuzz
Copyright (c) 2021 Google Inc. All rights reserved.
@@ -11415,36 +11416,6 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
-expat
-
-Copyright 2021 Google Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
skia
Copyright 2021 Google Inc.
