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

Commit ec103ad

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll src/third_party/skia a41a74a..ef85d19 (11 commits) (#6476)
https://skia.googlesource.com/skia.git/+log/a41a74ac7994..ef85d19100b1 Created with: gclient setdep -r src/third_party/skia@ef85d19100b1 The AutoRoll server is located here: https://autoroll.skia.org/r/skia-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary.
1 parent 289c6b1 commit ec103ad

File tree

3 files changed

+10
-109
lines changed

3 files changed

+10
-109
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ vars = {
2323
'fuchsia_git': 'https://fuchsia.googlesource.com',
2424
'github_git': 'https://github.com',
2525
'skia_git': 'https://skia.googlesource.com',
26-
'skia_revision': 'a41a74ac79940e3f9aea3814031e4925a981ac89',
26+
'skia_revision': 'ef85d19100b159b06e0f1aa43b4c3ed9e1bafd61',
2727

2828
# When updating the Dart revision, ensure that all entries that are
2929
# dependencies of Dart are also updated to match the entries in the

‎ci/licenses_golden/licenses_skia‎

Lines changed: 9 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 3ea6a5469cbb3993666d62c1ea1dd496
1+
Signature: 92e03111bad096c7328ae95d608a41ed
22

33
UNUSED LICENSES:
44

@@ -1582,6 +1582,8 @@ FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlResourceProvider.h
15821582
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlResourceProvider.mm
15831583
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlSampler.h
15841584
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlSampler.mm
1585+
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlStencilAttachment.h
1586+
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlStencilAttachment.mm
15851587
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlTextureRenderTarget.h
15861588
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlTextureRenderTarget.mm
15871589
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlUniformHandler.h
@@ -1623,6 +1625,7 @@ FILE: ../../../third_party/skia/src/sksl/ir/SkSLAppendStage.h
16231625
FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariableReference.cpp
16241626
FILE: ../../../third_party/skia/src/utils/Sk3D.cpp
16251627
FILE: ../../../third_party/skia/src/utils/SkAnimCodecPlayer.cpp
1628+
FILE: ../../../third_party/skia/src/utils/SkCallableTraits.h
16261629
FILE: ../../../third_party/skia/src/utils/SkJSON.cpp
16271630
FILE: ../../../third_party/skia/src/utils/SkJSON.h
16281631
FILE: ../../../third_party/skia/src/utils/mac/SkUniqueCFRef.h
@@ -2015,9 +2018,11 @@ FILE: ../../../third_party/skia/docs/status.json
20152018
FILE: ../../../third_party/skia/docs/undocumented.bmh
20162019
FILE: ../../../third_party/skia/docs/usingBookmaker.bmh
20172020
FILE: ../../../third_party/skia/experimental/canvaskit/canvas-kit/example.html
2021+
FILE: ../../../third_party/skia/experimental/canvaskit/canvas-kit/package.json
20182022
FILE: ../../../third_party/skia/experimental/canvaskit/externs.js
20192023
FILE: ../../../third_party/skia/experimental/canvaskit/helper.js
20202024
FILE: ../../../third_party/skia/experimental/canvaskit/interface.js
2025+
FILE: ../../../third_party/skia/experimental/canvaskit/package.json
20212026
FILE: ../../../third_party/skia/experimental/docs/animationCommon.js
20222027
FILE: ../../../third_party/skia/experimental/docs/backend.js
20232028
FILE: ../../../third_party/skia/experimental/docs/canvasBackend.js
@@ -2065,8 +2070,6 @@ FILE: ../../../third_party/skia/infra/bots/assets/win_toolchain_2015/VERSION
20652070
FILE: ../../../third_party/skia/infra/bots/assets/win_vulkan_sdk/VERSION
20662071
FILE: ../../../third_party/skia/infra/bots/calmbench.isolate
20672072
FILE: ../../../third_party/skia/infra/bots/cfg.json
2068-
FILE: ../../../third_party/skia/infra/bots/ct/blacklists/get_images_from_skps_100k_c37e844a6f8708-eee762104c75bd.json
2069-
FILE: ../../../third_party/skia/infra/bots/ct/blacklists/get_images_from_skps_100k_fad657e-276e633.json
20702073
FILE: ../../../third_party/skia/infra/bots/empty.isolate
20712074
FILE: ../../../third_party/skia/infra/bots/infrabots.isolate
20722075
FILE: ../../../third_party/skia/infra/bots/ios_bin.isolate
@@ -2095,7 +2098,9 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.ex
20952098
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json
20962099
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Debug-PathKit.json
20972100
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Release-PathKit.json
2101+
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-CanvasKit.json
20982102
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-PathKit.json
2103+
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-CanvasKit.json
20992104
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-PathKit.json
21002105
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-arm-Release-Chromecast.json
21012106
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json
@@ -2125,8 +2130,6 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/checkout/examples/full
21252130
FILE: ../../../third_party/skia/infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json
21262131
FILE: ../../../third_party/skia/infra/bots/recipe_modules/checkout/examples/full.expected/parent_revision_trybot.json
21272132
FILE: ../../../third_party/skia/infra/bots/recipe_modules/checkout/examples/full.expected/trybot.json
2128-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/ct/examples/full.expected/failed_gsutil.json
2129-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/ct/examples/full.expected/test.json
21302133
FILE: ../../../third_party/skia/infra/bots/recipe_modules/doxygen/examples/full.expected/doxygen.json
21312134
FILE: ../../../third_party/skia/infra/bots/recipe_modules/env/examples/full.expected/test.json
21322135
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
@@ -2164,30 +2167,7 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/gsutil/examples/full.e
21642167
FILE: ../../../third_party/skia/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_one_upload.json
21652168
FILE: ../../../third_party/skia/infra/bots/recipe_modules/gsutil/examples/full.expected/gsutil_tests.json
21662169
FILE: ../../../third_party/skia/infra/bots/recipe_modules/infra/examples/full.expected/infra_tests.json
2167-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/always-use-exparchive.json
2168-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/basic.json
2169-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/discover.json
2170-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch-bmiss.json
2171-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch-emiss.json
2172-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch.json
2173-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-miss.json
2174-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi-miss.json
2175-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi.json
2176-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive.json
2177-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/extra.json
2178-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/missing.json
2179-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/isolate/examples/full.expected/none.json
21802170
FILE: ../../../third_party/skia/infra/bots/recipe_modules/run/examples/full.expected/test.json
2181-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/skia_swarming/examples/full.expected/test.json
2182-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/swarming/examples/full.expected/basic.json
2183-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/swarming/examples/full.expected/show_isolated_out_in_collect_step.json
2184-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/swarming/examples/full.expected/show_shards_in_collect_step.json
2185-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_new.json
2186-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_old.json
2187-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_new.json
2188-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_old.json
2189-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/swarming/examples/full.expected/trybot.json
2190-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/swarming_client/examples/full.expected/basic.json
21912171
FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SKNX_NO_SIMD.json
21922172
FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
21932173
FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/win_test.json
@@ -2213,20 +2193,6 @@ FILE: ../../../third_party/skia/infra/bots/recipes/compile.expected/Build-Win-Cl
22132193
FILE: ../../../third_party/skia/infra/bots/recipes/compute_buildstats.expected/normal_bot.json
22142194
FILE: ../../../third_party/skia/infra/bots/recipes/compute_buildstats.expected/trybot.json
22152195
FILE: ../../../third_party/skia/infra/bots/recipes/compute_test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OpenCL.json
2216-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_10k_SKPs_UnknownBuilder.json
2217-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
2218-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json
2219-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json
2220-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
2221-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json
2222-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
2223-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
2224-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_DM_SKPs_UnknownBuilder.json
2225-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
2226-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
2227-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
2228-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
2229-
FILE: ../../../third_party/skia/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
22302196
FILE: ../../../third_party/skia/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
22312197
FILE: ../../../third_party/skia/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json
22322198
FILE: ../../../third_party/skia/infra/bots/recipes/infra.expected/infra_tests.json
@@ -5363,41 +5329,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
53635329
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
53645330
====================================================================================================
53655331

5366-
====================================================================================================
5367-
LIBRARY: skia
5368-
ORIGIN: ../../../third_party/skia/infra/bots/ct/ct_skps.isolate + ../../../LICENSE
5369-
TYPE: LicenseType.bsd
5370-
FILE: ../../../third_party/skia/infra/bots/ct/ct_skps.isolate
5371-
----------------------------------------------------------------------------------------------------
5372-
Copyright (c) 2015 The Chromium Authors. All rights reserved.
5373-
5374-
Redistribution and use in source and binary forms, with or without
5375-
modification, are permitted provided that the following conditions are
5376-
met:
5377-
5378-
* Redistributions of source code must retain the above copyright
5379-
notice, this list of conditions and the following disclaimer.
5380-
* Redistributions in binary form must reproduce the above
5381-
copyright notice, this list of conditions and the following disclaimer
5382-
in the documentation and/or other materials provided with the
5383-
distribution.
5384-
* Neither the name of Google Inc. nor the names of its
5385-
contributors may be used to endorse or promote products derived from
5386-
this software without specific prior written permission.
5387-
5388-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5389-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5390-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5391-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5392-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5393-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5394-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5395-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5396-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5397-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5398-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5399-
====================================================================================================
5400-
54015332
====================================================================================================
54025333
LIBRARY: skia
54035334
ORIGIN: ../../../third_party/skia/infra/bots/gen_tasks.go + ../../../LICENSE
@@ -6076,4 +6007,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
60766007
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
60776008
THE SOFTWARE.
60786009
====================================================================================================
6079-
Total license count: 54
6010+
Total license count: 53

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9866,36 +9866,6 @@ all copies or substantial portions of the Materials.
98669866
--------------------------------------------------------------------------------
98679867
skia
98689868

9869-
Copyright (c) 2015 The Chromium Authors. All rights reserved.
9870-
9871-
Redistribution and use in source and binary forms, with or without
9872-
modification, are permitted provided that the following conditions are
9873-
met:
9874-
9875-
* Redistributions of source code must retain the above copyright
9876-
notice, this list of conditions and the following disclaimer.
9877-
* Redistributions in binary form must reproduce the above
9878-
copyright notice, this list of conditions and the following disclaimer
9879-
in the documentation and/or other materials provided with the
9880-
distribution.
9881-
* Neither the name of Google Inc. nor the names of its
9882-
contributors may be used to endorse or promote products derived from
9883-
this software without specific prior written permission.
9884-
9885-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
9886-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
9887-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
9888-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
9889-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
9890-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
9891-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
9892-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
9893-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
9894-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9895-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9896-
--------------------------------------------------------------------------------
9897-
skia
9898-
98999869
Copyright 2005 The Android Open Source Project
99009870

99019871
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)