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

Commit 46adc3f

Browse files
Roll Skia from 59dcffca9061 to 3c4cd77c5e5d (22 revisions) (#39264)
https://skia.googlesource.com/skia.git/+log/59dcffca9061..3c4cd77c5e5d 2023-01-30 [email protected] Replace Pathops in Geometry::ChopMonoCubic implementation 2023-01-30 [email protected] [base] Add SkBezierCubic::subdivide 2023-01-30 [email protected] Add atan2_ primitive to SkRasterPipeline. 2023-01-30 [email protected] Add atan_ primitive to SkRasterPipeline. 2023-01-30 [email protected] Roll vulkan-deps from be674ea25e15 to be2b5b119b13 (4 revisions) 2023-01-30 [email protected] Repurpose sorttoy to filterfuzz 2023-01-30 [email protected] Fix UBSAN report in SkM44::Perspective. 2023-01-30 [email protected] Fetch and use ninja when building Skia Release Docker image 2023-01-30 [email protected] Revert "SkJpegCodec: Add SkJpegSourceMgr" 2023-01-30 [email protected] Add SkJpegGainmapEncoder::EncodeJpegR and EncodeHDRGM 2023-01-30 [email protected] Remove single use of commonFilterLoop 2023-01-30 [email protected] Remove use of SkMatrixProvider in SkShaderBase::appendRootStages 2023-01-30 [email protected] Have prepare mask drawing do position mapping 2023-01-30 [email protected] Simplify do-while loops that do not use `continue`. 2023-01-30 [email protected] Add mechanism for recycling temp slots. 2023-01-30 [email protected] Simplify for-loops with straight-line control flow. 2023-01-30 [email protected] Change branch-if-all-lanes-equal to branch-if-no-active-lanes-equal. 2023-01-30 [email protected] Track loop returns in addition to continue/break. 2023-01-30 [email protected] SkJpegCodec: Add SkJpegSourceMgr 2023-01-30 [email protected] Roll vulkan-deps from 9988b37a3351 to be674ea25e15 (1 revision) 2023-01-30 [email protected] Roll ANGLE from 1d9b8d802eb2 to 0cde45b7cbcc (12 revisions) 2023-01-30 [email protected] Roll Dawn from b2ec2c350576 to e8168a177ab2 (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 [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
1 parent b2efe01 commit 46adc3f

File tree

3 files changed

+80
-5
lines changed

3 files changed

+80
-5
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': '59dcffca90618578a6f9522dbad7c500a98884a1',
21+
'skia_revision': '3c4cd77c5e5dbb61a6dccfa9e37c23f151bc0b8d',
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: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 97be3fa871d462a5424a9cd3b6a78bad
1+
Signature: d0753b5051de59e255fb63bdb451b9d6
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -2189,6 +2189,43 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21892189
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
21902190
====================================================================================================
21912191

2192+
====================================================================================================
2193+
LIBRARY: skia
2194+
ORIGIN: ../../../third_party/skia/src/base/SkBezierCurves.cpp + ../../../third_party/skia/LICENSE
2195+
TYPE: LicenseType.bsd
2196+
FILE: ../../../third_party/skia/src/base/SkBezierCurves.cpp
2197+
----------------------------------------------------------------------------------------------------
2198+
Copyright 2012 Google LLC
2199+
2200+
Redistribution and use in source and binary forms, with or without
2201+
modification, are permitted provided that the following conditions are
2202+
met:
2203+
2204+
* Redistributions of source code must retain the above copyright
2205+
notice, this list of conditions and the following disclaimer.
2206+
2207+
* Redistributions in binary form must reproduce the above copyright
2208+
notice, this list of conditions and the following disclaimer in
2209+
the documentation and/or other materials provided with the
2210+
distribution.
2211+
2212+
* Neither the name of the copyright holder nor the names of its
2213+
contributors may be used to endorse or promote products derived
2214+
from this software without specific prior written permission.
2215+
2216+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
2217+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
2218+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
2219+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
2220+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
2221+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
2222+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
2223+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
2224+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2225+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2226+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2227+
====================================================================================================
2228+
21922229
====================================================================================================
21932230
LIBRARY: skia
21942231
ORIGIN: ../../../third_party/skia/src/core/SkImageFilter.cpp + ../../../third_party/skia/LICENSE
@@ -8872,6 +8909,7 @@ LIBRARY: skia
88728909
ORIGIN: ../../../third_party/skia/gm/imagefiltersunpremul.cpp + ../../../third_party/skia/LICENSE
88738910
ORIGIN: ../../../third_party/skia/include/private/SkGainmapInfo.h + ../../../third_party/skia/LICENSE
88748911
ORIGIN: ../../../third_party/skia/include/private/SkGainmapShader.h + ../../../third_party/skia/LICENSE
8912+
ORIGIN: ../../../third_party/skia/include/private/SkJpegGainmapEncoder.h + ../../../third_party/skia/LICENSE
88758913
ORIGIN: ../../../third_party/skia/src/codec/SkJpegGainmap.cpp + ../../../third_party/skia/LICENSE
88768914
ORIGIN: ../../../third_party/skia/src/codec/SkJpegGainmap.h + ../../../third_party/skia/LICENSE
88778915
ORIGIN: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp + ../../../third_party/skia/LICENSE
@@ -8880,11 +8918,13 @@ ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp + ../../../thi
88808918
ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.h + ../../../third_party/skia/LICENSE
88818919
ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h + ../../../third_party/skia/LICENSE
88828920
ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h + ../../../third_party/skia/LICENSE
8921+
ORIGIN: ../../../third_party/skia/src/images/SkJpegGainmapEncoder.cpp + ../../../third_party/skia/LICENSE
88838922
ORIGIN: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp + ../../../third_party/skia/LICENSE
88848923
TYPE: LicenseType.bsd
88858924
FILE: ../../../third_party/skia/gm/imagefiltersunpremul.cpp
88868925
FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h
88878926
FILE: ../../../third_party/skia/include/private/SkGainmapShader.h
8927+
FILE: ../../../third_party/skia/include/private/SkJpegGainmapEncoder.h
88888928
FILE: ../../../third_party/skia/src/codec/SkJpegGainmap.cpp
88898929
FILE: ../../../third_party/skia/src/codec/SkJpegGainmap.h
88908930
FILE: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp
@@ -8893,6 +8933,7 @@ FILE: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp
88938933
FILE: ../../../third_party/skia/src/codec/SkJpegSegmentScan.h
88948934
FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h
88958935
FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h
8936+
FILE: ../../../third_party/skia/src/images/SkJpegGainmapEncoder.cpp
88968937
FILE: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp
88978938
----------------------------------------------------------------------------------------------------
88988939
Copyright 2023 Google Inc.
@@ -8933,6 +8974,7 @@ ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp + ../../.
89338974
ORIGIN: ../../../third_party/skia/include/private/SkMalloc.h + ../../../third_party/skia/LICENSE
89348975
ORIGIN: ../../../third_party/skia/include/private/SkTemplates.h + ../../../third_party/skia/LICENSE
89358976
ORIGIN: ../../../third_party/skia/include/private/base/SkCPUTypes.h + ../../../third_party/skia/LICENSE
8977+
ORIGIN: ../../../third_party/skia/src/base/SkBezierCurves.h + ../../../third_party/skia/LICENSE
89368978
ORIGIN: ../../../third_party/skia/src/base/SkCubics.cpp + ../../../third_party/skia/LICENSE
89378979
ORIGIN: ../../../third_party/skia/src/base/SkCubics.h + ../../../third_party/skia/LICENSE
89388980
ORIGIN: ../../../third_party/skia/src/base/SkFloatingPoint.cpp + ../../../third_party/skia/LICENSE
@@ -8942,15 +8984,16 @@ ORIGIN: ../../../third_party/skia/src/base/SkSafeMath.cpp + ../../../third_party
89428984
ORIGIN: ../../../third_party/skia/src/core/SkTSearch.h + ../../../third_party/skia/LICENSE
89438985
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp + ../../../third_party/skia/LICENSE
89448986
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.h + ../../../third_party/skia/LICENSE
8987+
ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp + ../../../third_party/skia/LICENSE
89458988
ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLGetReturnComplexity.cpp + ../../../third_party/skia/LICENSE
8946-
ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLHasContinueOrBreak.cpp + ../../../third_party/skia/LICENSE
89478989
ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression.cpp + ../../../third_party/skia/LICENSE
89488990
TYPE: LicenseType.bsd
89498991
FILE: ../../../third_party/skia/fuzz/FuzzCubicQuadRoots.cpp
89508992
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp
89518993
FILE: ../../../third_party/skia/include/private/SkMalloc.h
89528994
FILE: ../../../third_party/skia/include/private/SkTemplates.h
89538995
FILE: ../../../third_party/skia/include/private/base/SkCPUTypes.h
8996+
FILE: ../../../third_party/skia/src/base/SkBezierCurves.h
89548997
FILE: ../../../third_party/skia/src/base/SkCubics.cpp
89558998
FILE: ../../../third_party/skia/src/base/SkCubics.h
89568999
FILE: ../../../third_party/skia/src/base/SkFloatingPoint.cpp
@@ -8960,8 +9003,8 @@ FILE: ../../../third_party/skia/src/base/SkSafeMath.cpp
89609003
FILE: ../../../third_party/skia/src/core/SkTSearch.h
89619004
FILE: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp
89629005
FILE: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.h
9006+
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp
89639007
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetReturnComplexity.cpp
8964-
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLHasContinueOrBreak.cpp
89659008
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression.cpp
89669009
----------------------------------------------------------------------------------------------------
89679010
Copyright 2023 Google LLC
@@ -8995,4 +9038,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
89959038
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
89969039
====================================================================================================
89979040

8998-
Total license count: 64
9041+
Total license count: 65

sky/packages/sky_engine/LICENSE

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25282,6 +25282,38 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2528225282
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2528325283
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2528425284
--------------------------------------------------------------------------------
25285+
skia
25286+
25287+
Copyright 2012 Google LLC
25288+
25289+
Redistribution and use in source and binary forms, with or without
25290+
modification, are permitted provided that the following conditions are
25291+
met:
25292+
25293+
* Redistributions of source code must retain the above copyright
25294+
notice, this list of conditions and the following disclaimer.
25295+
25296+
* Redistributions in binary form must reproduce the above copyright
25297+
notice, this list of conditions and the following disclaimer in
25298+
the documentation and/or other materials provided with the
25299+
distribution.
25300+
25301+
* Neither the name of the copyright holder nor the names of its
25302+
contributors may be used to endorse or promote products derived
25303+
from this software without specific prior written permission.
25304+
25305+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
25306+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
25307+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25308+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
25309+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25310+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25311+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25312+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25313+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25314+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25315+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25316+
--------------------------------------------------------------------------------
2528525317
angle
2528625318

2528725319
Copyright 2012 The ANGLE Project Authors. All rights reserved.

0 commit comments

Comments
 (0)