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

Commit de54c40

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from 89f8ba6f749d to 55f654bf5cff (8 revisions) (#37725)
https://skia.googlesource.com/skia.git/+log/89f8ba6f749d..55f654bf5cff 2022-11-17 bsalomon@google.com Last samples from samplecode/ converted to Slides 2022-11-17 herb@google.com Consolidate capacity overflow error message 2022-11-17 jmbetancourt@google.com [jetski] rename androidkit to jetski 2022-11-17 brianosman@google.com Fully remove legacy clamp-to-gamut logic 2022-11-17 fmalita@chromium.org [skottie] Add shaper cluster info 2022-11-17 brianosman@google.com Add more GMs to test new CSS gradients 2022-11-17 brianosman@google.com Remove legacy dither flag 2022-11-17 bsalomon@google.com Take 10 down, convert them to slides, 8 files of samples on the wall 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 aaclarke@google.com,tdenniston@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 b65c24c commit de54c40

File tree

3 files changed

+25
-112
lines changed

3 files changed

+25
-112
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': '89f8ba6f749d89fe201c812cc3a67fbf4db6572b',
21+
'skia_revision': '55f654bf5cff8eb8a5364725509204271100ca81',
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: 24 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 2f8b83d5be72c5ca9a310ed576613425
1+
Signature: 275f7cfce617c35e931f9a2d0694989f
22

33
UNUSED LICENSES:
44

@@ -2037,9 +2037,6 @@ FILE: ../../../third_party/skia/include/private/SkTArray.h
20372037
FILE: ../../../third_party/skia/include/utils/SkNWayCanvas.h
20382038
FILE: ../../../third_party/skia/include/utils/mac/SkCGUtils.h
20392039
FILE: ../../../third_party/skia/samplecode/Sample.h
2040-
FILE: ../../../third_party/skia/samplecode/SampleSlides.cpp
2041-
FILE: ../../../third_party/skia/samplecode/SampleTextBox.cpp
2042-
FILE: ../../../third_party/skia/samplecode/vertexdump.cpp
20432040
FILE: ../../../third_party/skia/src/core/SkAAClip.cpp
20442041
FILE: ../../../third_party/skia/src/core/SkAAClip.h
20452042
FILE: ../../../third_party/skia/src/core/SkAdvancedTypefaceMetrics.h
@@ -2620,7 +2617,6 @@ FILE: ../../../third_party/skia/include/private/SkTFitsIn.h
26202617
FILE: ../../../third_party/skia/include/private/SkTLogic.h
26212618
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrTypesPriv.h
26222619
FILE: ../../../third_party/skia/include/utils/SkCanvasStateUtils.h
2623-
FILE: ../../../third_party/skia/samplecode/SampleStringArt.cpp
26242620
FILE: ../../../third_party/skia/src/core/SkBitmapDevice.cpp
26252621
FILE: ../../../third_party/skia/src/core/SkBitmapDevice.h
26262622
FILE: ../../../third_party/skia/src/core/SkDataTable.cpp
@@ -3161,8 +3157,6 @@ FILE: ../../../third_party/skia/include/private/SkTHash.h
31613157
FILE: ../../../third_party/skia/include/private/SkThreadID.h
31623158
FILE: ../../../third_party/skia/include/svg/SkSVGCanvas.h
31633159
FILE: ../../../third_party/skia/include/utils/SkPaintFilterCanvas.h
3164-
FILE: ../../../third_party/skia/samplecode/SampleShip.cpp
3165-
FILE: ../../../third_party/skia/samplecode/SampleXfer.cpp
31663160
FILE: ../../../third_party/skia/src/codec/SkAndroidCodec.cpp
31673161
FILE: ../../../third_party/skia/src/codec/SkAndroidCodecAdapter.cpp
31683162
FILE: ../../../third_party/skia/src/codec/SkAndroidCodecAdapter.h
@@ -3620,7 +3614,6 @@ FILE: ../../../third_party/skia/modules/svg/src/SkSVGTransformableNode.cpp
36203614
FILE: ../../../third_party/skia/modules/svg/src/SkSVGValue.cpp
36213615
FILE: ../../../third_party/skia/samplecode/DecodeFile.h
36223616
FILE: ../../../third_party/skia/samplecode/Sample.cpp
3623-
FILE: ../../../third_party/skia/samplecode/SampleSVGFile.cpp
36243617
FILE: ../../../third_party/skia/src/codec/SkRawCodec.cpp
36253618
FILE: ../../../third_party/skia/src/codec/SkRawCodec.h
36263619
FILE: ../../../third_party/skia/src/core/SkATrace.cpp
@@ -4100,10 +4093,6 @@ FILE: ../../../third_party/skia/modules/svg/src/SkSVGGradient.cpp
41004093
FILE: ../../../third_party/skia/modules/svg/src/SkSVGPattern.cpp
41014094
FILE: ../../../third_party/skia/modules/svg/src/SkSVGRadialGradient.cpp
41024095
FILE: ../../../third_party/skia/modules/svg/src/SkSVGUse.cpp
4103-
FILE: ../../../third_party/skia/samplecode/SampleShadowColor.cpp
4104-
FILE: ../../../third_party/skia/samplecode/SampleShadowReference.cpp
4105-
FILE: ../../../third_party/skia/samplecode/SampleShadowUtils.cpp
4106-
FILE: ../../../third_party/skia/samplecode/SampleStrokeVerb.cpp
41074096
FILE: ../../../third_party/skia/src/android/SkAndroidFrameworkUtils.cpp
41084097
FILE: ../../../third_party/skia/src/codec/SkBmpBaseCodec.cpp
41094098
FILE: ../../../third_party/skia/src/codec/SkBmpBaseCodec.h
@@ -4863,9 +4852,6 @@ FILE: ../../../third_party/skia/modules/sksg/src/SkSGRenderEffect.cpp
48634852
FILE: ../../../third_party/skia/modules/sksg/src/SkSGTransformPriv.h
48644853
FILE: ../../../third_party/skia/modules/svg/include/SkSVGText.h
48654854
FILE: ../../../third_party/skia/modules/svg/src/SkSVGText.cpp
4866-
FILE: ../../../third_party/skia/samplecode/SampleDegenerateQuads.cpp
4867-
FILE: ../../../third_party/skia/samplecode/SampleSG.cpp
4868-
FILE: ../../../third_party/skia/samplecode/SampleThinAA.cpp
48694855
FILE: ../../../third_party/skia/src/codec/SkScalingCodec.h
48704856
FILE: ../../../third_party/skia/src/core/SkDescriptor.cpp
48714857
FILE: ../../../third_party/skia/src/core/SkDraw_atlas.cpp
@@ -4974,43 +4960,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
49744960
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
49754961
====================================================================================================
49764962

4977-
====================================================================================================
4978-
LIBRARY: skia
4979-
ORIGIN: ../../../third_party/skia/samplecode/SampleTextureUpload.cpp + ../../../third_party/skia/LICENSE
4980-
TYPE: LicenseType.bsd
4981-
FILE: ../../../third_party/skia/samplecode/SampleTextureUpload.cpp
4982-
----------------------------------------------------------------------------------------------------
4983-
Copyright 2019 Google Inc. and Adobe Inc.
4984-
4985-
Redistribution and use in source and binary forms, with or without
4986-
modification, are permitted provided that the following conditions are
4987-
met:
4988-
4989-
* Redistributions of source code must retain the above copyright
4990-
notice, this list of conditions and the following disclaimer.
4991-
4992-
* Redistributions in binary form must reproduce the above copyright
4993-
notice, this list of conditions and the following disclaimer in
4994-
the documentation and/or other materials provided with the
4995-
distribution.
4996-
4997-
* Neither the name of the copyright holder nor the names of its
4998-
contributors may be used to endorse or promote products derived
4999-
from this software without specific prior written permission.
5000-
5001-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5002-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5003-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5004-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5005-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5006-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5007-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5008-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5009-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5010-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5011-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5012-
====================================================================================================
5013-
50144963
====================================================================================================
50154964
LIBRARY: skia
50164965
ORIGIN: ../../../third_party/skia/bench/BulkRectBench.cpp + ../../../third_party/skia/LICENSE
@@ -6187,7 +6136,6 @@ FILE: ../../../third_party/skia/modules/skplaintexteditor/src/shape.h
61876136
FILE: ../../../third_party/skia/modules/skplaintexteditor/src/stringslice.cpp
61886137
FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.cpp
61896138
FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.h
6190-
FILE: ../../../third_party/skia/samplecode/SamplePathTessellators.cpp
61916139
FILE: ../../../third_party/skia/src/core/SkContainers.cpp
61926140
FILE: ../../../third_party/skia/src/core/SkMalloc.cpp
61936141
FILE: ../../../third_party/skia/src/core/SkPixelRefPriv.h
@@ -6454,9 +6402,6 @@ FILE: ../../../third_party/skia/modules/svg/src/SkSVGFilter.cpp
64546402
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFilterContext.cpp
64556403
FILE: ../../../third_party/skia/modules/svg/src/SkSVGTextPriv.h
64566404
FILE: ../../../third_party/skia/modules/svg/utils/SvgTool.cpp
6457-
FILE: ../../../third_party/skia/samplecode/SampleSimpleStroker.cpp
6458-
FILE: ../../../third_party/skia/samplecode/SampleTiming.cpp
6459-
FILE: ../../../third_party/skia/samplecode/SampleVariableWidthStroker.cpp
64606405
FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h
64616406
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.cpp
64626407
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.h
@@ -7083,28 +7028,28 @@ FILE: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h
70837028
FILE: ../../../third_party/skia/infra/bots/task_drivers/push_apps_from_skia_image/push_apps_from_skia_image.go
70847029
FILE: ../../../third_party/skia/infra/bots/task_drivers/push_bazel_apps_from_wasm_image/push_bazel_apps_from_wasm_image.go
70857030
FILE: ../../../third_party/skia/infra/bots/task_drivers/recreate_skps/recreate_skps.go
7086-
FILE: ../../../third_party/skia/modules/androidkit/src/AndroidKit.cpp
7087-
FILE: ../../../third_party/skia/modules/androidkit/src/Canvas.cpp
7088-
FILE: ../../../third_party/skia/modules/androidkit/src/ColorFilters.cpp
7089-
FILE: ../../../third_party/skia/modules/androidkit/src/Font.cpp
7090-
FILE: ../../../third_party/skia/modules/androidkit/src/FontChainAdapter.cpp
7091-
FILE: ../../../third_party/skia/modules/androidkit/src/Gradients.cpp
7092-
FILE: ../../../third_party/skia/modules/androidkit/src/Image.cpp
7093-
FILE: ../../../third_party/skia/modules/androidkit/src/ImageFilter.cpp
7094-
FILE: ../../../third_party/skia/modules/androidkit/src/Matrix.cpp
7095-
FILE: ../../../third_party/skia/modules/androidkit/src/Paint.cpp
7096-
FILE: ../../../third_party/skia/modules/androidkit/src/Path.cpp
7097-
FILE: ../../../third_party/skia/modules/androidkit/src/PathBuilder.cpp
7098-
FILE: ../../../third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
7099-
FILE: ../../../third_party/skia/modules/androidkit/src/Shader.cpp
7100-
FILE: ../../../third_party/skia/modules/androidkit/src/SkottieAnimation.cpp
7101-
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.cpp
7102-
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.h
7103-
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.cpp
7104-
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.h
7105-
FILE: ../../../third_party/skia/modules/androidkit/src/Text.cpp
7106-
FILE: ../../../third_party/skia/modules/androidkit/src/Utils.cpp
7107-
FILE: ../../../third_party/skia/modules/androidkit/src/Utils.h
7031+
FILE: ../../../third_party/skia/modules/jetski/src/Canvas.cpp
7032+
FILE: ../../../third_party/skia/modules/jetski/src/ColorFilters.cpp
7033+
FILE: ../../../third_party/skia/modules/jetski/src/Font.cpp
7034+
FILE: ../../../third_party/skia/modules/jetski/src/FontChainAdapter.cpp
7035+
FILE: ../../../third_party/skia/modules/jetski/src/Gradients.cpp
7036+
FILE: ../../../third_party/skia/modules/jetski/src/Image.cpp
7037+
FILE: ../../../third_party/skia/modules/jetski/src/ImageFilter.cpp
7038+
FILE: ../../../third_party/skia/modules/jetski/src/JetSki.cpp
7039+
FILE: ../../../third_party/skia/modules/jetski/src/Matrix.cpp
7040+
FILE: ../../../third_party/skia/modules/jetski/src/Paint.cpp
7041+
FILE: ../../../third_party/skia/modules/jetski/src/Path.cpp
7042+
FILE: ../../../third_party/skia/modules/jetski/src/PathBuilder.cpp
7043+
FILE: ../../../third_party/skia/modules/jetski/src/RuntimeShaderBuilder.cpp
7044+
FILE: ../../../third_party/skia/modules/jetski/src/Shader.cpp
7045+
FILE: ../../../third_party/skia/modules/jetski/src/SkottieAnimation.cpp
7046+
FILE: ../../../third_party/skia/modules/jetski/src/Surface.cpp
7047+
FILE: ../../../third_party/skia/modules/jetski/src/Surface.h
7048+
FILE: ../../../third_party/skia/modules/jetski/src/SurfaceThread.cpp
7049+
FILE: ../../../third_party/skia/modules/jetski/src/SurfaceThread.h
7050+
FILE: ../../../third_party/skia/modules/jetski/src/Text.cpp
7051+
FILE: ../../../third_party/skia/modules/jetski/src/Utils.cpp
7052+
FILE: ../../../third_party/skia/modules/jetski/src/Utils.h
71087053
FILE: ../../../third_party/skia/modules/skottie/src/effects/BulgeEffect.cpp
71097054
FILE: ../../../third_party/skia/modules/skottie/src/effects/CCTonerEffect.cpp
71107055
FILE: ../../../third_party/skia/modules/skottie/src/effects/DirectionalBlur.cpp
@@ -8054,4 +7999,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
80547999
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
80558000
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
80568001
====================================================================================================
8057-
Total license count: 69
8002+
Total license count: 68

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10846,38 +10846,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1084610846
--------------------------------------------------------------------------------
1084710847
skia
1084810848

10849-
Copyright 2019 Google Inc. and Adobe Inc.
10850-
10851-
Redistribution and use in source and binary forms, with or without
10852-
modification, are permitted provided that the following conditions are
10853-
met:
10854-
10855-
* Redistributions of source code must retain the above copyright
10856-
notice, this list of conditions and the following disclaimer.
10857-
10858-
* Redistributions in binary form must reproduce the above copyright
10859-
notice, this list of conditions and the following disclaimer in
10860-
the documentation and/or other materials provided with the
10861-
distribution.
10862-
10863-
* Neither the name of the copyright holder nor the names of its
10864-
contributors may be used to endorse or promote products derived
10865-
from this software without specific prior written permission.
10866-
10867-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
10868-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
10869-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
10870-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
10871-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
10872-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
10873-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
10874-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
10875-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
10876-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
10877-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10878-
--------------------------------------------------------------------------------
10879-
skia
10880-
1088110849
Copyright 2019 Google LLC
1088210850

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

0 commit comments

Comments
 (0)