Skip to content

Commit

Permalink
Roll Skia from 89f8ba6f749d to 55f654bf5cff (8 revisions) (flutter#37725
Browse files Browse the repository at this point in the history
)

https://skia.googlesource.com/skia.git/+log/89f8ba6f749d..55f654bf5cff

2022-11-17 [email protected] Last samples from samplecode/ converted to Slides
2022-11-17 [email protected] Consolidate capacity overflow error message
2022-11-17 [email protected] [jetski] rename androidkit to jetski
2022-11-17 [email protected] Fully remove legacy clamp-to-gamut logic
2022-11-17 [email protected] [skottie] Add shaper cluster info
2022-11-17 [email protected] Add more GMs to test new CSS gradients
2022-11-17 [email protected] Remove legacy dither flag
2022-11-17 [email protected] 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 [email protected],[email protected] 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
  • Loading branch information
skia-flutter-autoroll authored Nov 17, 2022
1 parent b65c24c commit de54c40
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 112 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ vars = {
'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': '89f8ba6f749d89fe201c812cc3a67fbf4db6572b',
'skia_revision': '55f654bf5cff8eb8a5364725509204271100ca81',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down
103 changes: 24 additions & 79 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 2f8b83d5be72c5ca9a310ed576613425
Signature: 275f7cfce617c35e931f9a2d0694989f

UNUSED LICENSES:

Expand Down Expand Up @@ -2037,9 +2037,6 @@ FILE: ../../../third_party/skia/include/private/SkTArray.h
FILE: ../../../third_party/skia/include/utils/SkNWayCanvas.h
FILE: ../../../third_party/skia/include/utils/mac/SkCGUtils.h
FILE: ../../../third_party/skia/samplecode/Sample.h
FILE: ../../../third_party/skia/samplecode/SampleSlides.cpp
FILE: ../../../third_party/skia/samplecode/SampleTextBox.cpp
FILE: ../../../third_party/skia/samplecode/vertexdump.cpp
FILE: ../../../third_party/skia/src/core/SkAAClip.cpp
FILE: ../../../third_party/skia/src/core/SkAAClip.h
FILE: ../../../third_party/skia/src/core/SkAdvancedTypefaceMetrics.h
Expand Down Expand Up @@ -2620,7 +2617,6 @@ FILE: ../../../third_party/skia/include/private/SkTFitsIn.h
FILE: ../../../third_party/skia/include/private/SkTLogic.h
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrTypesPriv.h
FILE: ../../../third_party/skia/include/utils/SkCanvasStateUtils.h
FILE: ../../../third_party/skia/samplecode/SampleStringArt.cpp
FILE: ../../../third_party/skia/src/core/SkBitmapDevice.cpp
FILE: ../../../third_party/skia/src/core/SkBitmapDevice.h
FILE: ../../../third_party/skia/src/core/SkDataTable.cpp
Expand Down Expand Up @@ -3161,8 +3157,6 @@ FILE: ../../../third_party/skia/include/private/SkTHash.h
FILE: ../../../third_party/skia/include/private/SkThreadID.h
FILE: ../../../third_party/skia/include/svg/SkSVGCanvas.h
FILE: ../../../third_party/skia/include/utils/SkPaintFilterCanvas.h
FILE: ../../../third_party/skia/samplecode/SampleShip.cpp
FILE: ../../../third_party/skia/samplecode/SampleXfer.cpp
FILE: ../../../third_party/skia/src/codec/SkAndroidCodec.cpp
FILE: ../../../third_party/skia/src/codec/SkAndroidCodecAdapter.cpp
FILE: ../../../third_party/skia/src/codec/SkAndroidCodecAdapter.h
Expand Down Expand Up @@ -3620,7 +3614,6 @@ FILE: ../../../third_party/skia/modules/svg/src/SkSVGTransformableNode.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGValue.cpp
FILE: ../../../third_party/skia/samplecode/DecodeFile.h
FILE: ../../../third_party/skia/samplecode/Sample.cpp
FILE: ../../../third_party/skia/samplecode/SampleSVGFile.cpp
FILE: ../../../third_party/skia/src/codec/SkRawCodec.cpp
FILE: ../../../third_party/skia/src/codec/SkRawCodec.h
FILE: ../../../third_party/skia/src/core/SkATrace.cpp
Expand Down Expand Up @@ -4100,10 +4093,6 @@ FILE: ../../../third_party/skia/modules/svg/src/SkSVGGradient.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGPattern.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGRadialGradient.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGUse.cpp
FILE: ../../../third_party/skia/samplecode/SampleShadowColor.cpp
FILE: ../../../third_party/skia/samplecode/SampleShadowReference.cpp
FILE: ../../../third_party/skia/samplecode/SampleShadowUtils.cpp
FILE: ../../../third_party/skia/samplecode/SampleStrokeVerb.cpp
FILE: ../../../third_party/skia/src/android/SkAndroidFrameworkUtils.cpp
FILE: ../../../third_party/skia/src/codec/SkBmpBaseCodec.cpp
FILE: ../../../third_party/skia/src/codec/SkBmpBaseCodec.h
Expand Down Expand Up @@ -4863,9 +4852,6 @@ FILE: ../../../third_party/skia/modules/sksg/src/SkSGRenderEffect.cpp
FILE: ../../../third_party/skia/modules/sksg/src/SkSGTransformPriv.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGText.h
FILE: ../../../third_party/skia/modules/svg/src/SkSVGText.cpp
FILE: ../../../third_party/skia/samplecode/SampleDegenerateQuads.cpp
FILE: ../../../third_party/skia/samplecode/SampleSG.cpp
FILE: ../../../third_party/skia/samplecode/SampleThinAA.cpp
FILE: ../../../third_party/skia/src/codec/SkScalingCodec.h
FILE: ../../../third_party/skia/src/core/SkDescriptor.cpp
FILE: ../../../third_party/skia/src/core/SkDraw_atlas.cpp
Expand Down Expand Up @@ -4974,43 +4960,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/samplecode/SampleTextureUpload.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/samplecode/SampleTextureUpload.cpp
----------------------------------------------------------------------------------------------------
Copyright 2019 Google Inc. and Adobe 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 the copyright holder 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/BulkRectBench.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -6187,7 +6136,6 @@ FILE: ../../../third_party/skia/modules/skplaintexteditor/src/shape.h
FILE: ../../../third_party/skia/modules/skplaintexteditor/src/stringslice.cpp
FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.cpp
FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.h
FILE: ../../../third_party/skia/samplecode/SamplePathTessellators.cpp
FILE: ../../../third_party/skia/src/core/SkContainers.cpp
FILE: ../../../third_party/skia/src/core/SkMalloc.cpp
FILE: ../../../third_party/skia/src/core/SkPixelRefPriv.h
Expand Down Expand Up @@ -6454,9 +6402,6 @@ FILE: ../../../third_party/skia/modules/svg/src/SkSVGFilter.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFilterContext.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGTextPriv.h
FILE: ../../../third_party/skia/modules/svg/utils/SvgTool.cpp
FILE: ../../../third_party/skia/samplecode/SampleSimpleStroker.cpp
FILE: ../../../third_party/skia/samplecode/SampleTiming.cpp
FILE: ../../../third_party/skia/samplecode/SampleVariableWidthStroker.cpp
FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.cpp
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.h
Expand Down Expand Up @@ -7083,28 +7028,28 @@ FILE: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h
FILE: ../../../third_party/skia/infra/bots/task_drivers/push_apps_from_skia_image/push_apps_from_skia_image.go
FILE: ../../../third_party/skia/infra/bots/task_drivers/push_bazel_apps_from_wasm_image/push_bazel_apps_from_wasm_image.go
FILE: ../../../third_party/skia/infra/bots/task_drivers/recreate_skps/recreate_skps.go
FILE: ../../../third_party/skia/modules/androidkit/src/AndroidKit.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Canvas.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/ColorFilters.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Font.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/FontChainAdapter.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Gradients.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Image.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/ImageFilter.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Matrix.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Paint.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Path.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/PathBuilder.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Shader.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/SkottieAnimation.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.h
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.h
FILE: ../../../third_party/skia/modules/androidkit/src/Text.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Utils.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Utils.h
FILE: ../../../third_party/skia/modules/jetski/src/Canvas.cpp
FILE: ../../../third_party/skia/modules/jetski/src/ColorFilters.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Font.cpp
FILE: ../../../third_party/skia/modules/jetski/src/FontChainAdapter.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Gradients.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Image.cpp
FILE: ../../../third_party/skia/modules/jetski/src/ImageFilter.cpp
FILE: ../../../third_party/skia/modules/jetski/src/JetSki.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Matrix.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Paint.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Path.cpp
FILE: ../../../third_party/skia/modules/jetski/src/PathBuilder.cpp
FILE: ../../../third_party/skia/modules/jetski/src/RuntimeShaderBuilder.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Shader.cpp
FILE: ../../../third_party/skia/modules/jetski/src/SkottieAnimation.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Surface.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Surface.h
FILE: ../../../third_party/skia/modules/jetski/src/SurfaceThread.cpp
FILE: ../../../third_party/skia/modules/jetski/src/SurfaceThread.h
FILE: ../../../third_party/skia/modules/jetski/src/Text.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Utils.cpp
FILE: ../../../third_party/skia/modules/jetski/src/Utils.h
FILE: ../../../third_party/skia/modules/skottie/src/effects/BulgeEffect.cpp
FILE: ../../../third_party/skia/modules/skottie/src/effects/CCTonerEffect.cpp
FILE: ../../../third_party/skia/modules/skottie/src/effects/DirectionalBlur.cpp
Expand Down Expand Up @@ -8054,4 +7999,4 @@ 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.
====================================================================================================
Total license count: 69
Total license count: 68
32 changes: 0 additions & 32 deletions sky/packages/sky_engine/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -10846,38 +10846,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
skia

Copyright 2019 Google Inc. and Adobe 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 the copyright holder 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 2019 Google LLC

Redistribution and use in source and binary forms, with or without
Expand Down

0 comments on commit de54c40

Please sign in to comment.