Skip to content

Commit 435c716

Browse files
NoamDevNoamDev
authored
Revert "Roll src/third_party/skia f9aea7f..e4ddb8a (35 commits) (flutter#15931)"
This reverts commit dcc2e1d.
1 parent 4fec18c commit 435c716

File tree

2 files changed

+41
-52
lines changed

2 files changed

+41
-52
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ vars = {
2626
'skia_git': 'https://skia.googlesource.com',
2727
# OCMock is for testing only so there is no google clone
2828
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
29-
'skia_revision': 'e4ddb8a7cddc6335cf828fce53d9d04f287389d1',
29+
'skia_revision': 'f9aea7f7e502894a2708063a54175b50ce220ede',
3030

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

‎ci/licenses_golden/licenses_skia‎

Lines changed: 40 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 411fc64fe581574d81cebe1cdf535e30
1+
Signature: 9e46b0ff096183bbe63eda3c41b2cb3a
22

33
UNUSED LICENSES:
44

@@ -3360,6 +3360,7 @@ FILE: ../../../third_party/skia/include/utils/SkTextUtils.h
33603360
FILE: ../../../third_party/skia/infra/cts/run_testlab.go
33613361
FILE: ../../../third_party/skia/modules/skottie/gm/3dgm.cpp
33623362
FILE: ../../../third_party/skia/modules/skottie/include/SkottieProperty.h
3363+
FILE: ../../../third_party/skia/modules/skottie/src/SkottieAdapter.cpp
33633364
FILE: ../../../third_party/skia/modules/skottie/src/SkottieAdapter.h
33643365
FILE: ../../../third_party/skia/modules/skottie/src/SkottieJson.cpp
33653366
FILE: ../../../third_party/skia/modules/skottie/src/SkottieJson.h
@@ -3368,8 +3369,8 @@ FILE: ../../../third_party/skia/modules/skottie/src/SkottieProperty.cpp
33683369
FILE: ../../../third_party/skia/modules/skottie/src/SkottieTest.cpp
33693370
FILE: ../../../third_party/skia/modules/skottie/src/SkottieTool.cpp
33703371
FILE: ../../../third_party/skia/modules/skottie/src/layers/PrecompLayer.cpp
3372+
FILE: ../../../third_party/skia/modules/skottie/src/layers/ShapeLayer.cpp
33713373
FILE: ../../../third_party/skia/modules/skottie/src/layers/TextLayer.cpp
3372-
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.cpp
33733374
FILE: ../../../third_party/skia/modules/skottie/utils/SkottieUtils.cpp
33743375
FILE: ../../../third_party/skia/modules/skottie/utils/SkottieUtils.h
33753376
FILE: ../../../third_party/skia/modules/sksg/include/SkSGClipEffect.h
@@ -3974,45 +3975,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
39743975
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39753976
====================================================================================================
39763977

3977-
====================================================================================================
3978-
LIBRARY: skia
3979-
ORIGIN: ../../../third_party/skia/bench/GrQuadBench.cpp + ../../../third_party/skia/LICENSE
3980-
TYPE: LicenseType.bsd
3981-
FILE: ../../../third_party/skia/bench/GrQuadBench.cpp
3982-
FILE: ../../../third_party/skia/gm/crbug_224618.cpp
3983-
FILE: ../../../third_party/skia/src/core/SkVM_fwd.h
3984-
----------------------------------------------------------------------------------------------------
3985-
Copyright 2020 Google LLC
3986-
3987-
Redistribution and use in source and binary forms, with or without
3988-
modification, are permitted provided that the following conditions are
3989-
met:
3990-
3991-
* Redistributions of source code must retain the above copyright
3992-
notice, this list of conditions and the following disclaimer.
3993-
3994-
* Redistributions in binary form must reproduce the above copyright
3995-
notice, this list of conditions and the following disclaimer in
3996-
the documentation and/or other materials provided with the
3997-
distribution.
3998-
3999-
* Neither the name of the copyright holder nor the names of its
4000-
contributors may be used to endorse or promote products derived
4001-
from this software without specific prior written permission.
4002-
4003-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
4004-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
4005-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
4006-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
4007-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
4008-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
4009-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
4010-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
4011-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
4012-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
4013-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4014-
====================================================================================================
4015-
40163978
====================================================================================================
40173979
LIBRARY: skia
40183980
ORIGIN: ../../../third_party/skia/bench/ParagraphBench.cpp + ../../../third_party/skia/LICENSE
@@ -5605,22 +5567,12 @@ FILE: ../../../third_party/skia/gm/bicubic.cpp
56055567
FILE: ../../../third_party/skia/gm/compressed_textures.cpp
56065568
FILE: ../../../third_party/skia/gm/strokerect_anisotropic.cpp
56075569
FILE: ../../../third_party/skia/include/private/SkM44.h
5608-
FILE: ../../../third_party/skia/modules/skottie/src/Adapter.h
56095570
FILE: ../../../third_party/skia/modules/skottie/src/Animator.cpp
56105571
FILE: ../../../third_party/skia/modules/skottie/src/Animator.h
56115572
FILE: ../../../third_party/skia/modules/skottie/src/Camera.cpp
56125573
FILE: ../../../third_party/skia/modules/skottie/src/Camera.h
56135574
FILE: ../../../third_party/skia/modules/skottie/src/Transform.cpp
56145575
FILE: ../../../third_party/skia/modules/skottie/src/Transform.h
5615-
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Ellipse.cpp
5616-
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Gradient.cpp
5617-
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/MergePaths.cpp
5618-
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Polystar.cpp
5619-
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Rectangle.cpp
5620-
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Repeater.cpp
5621-
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/RoundCorners.cpp
5622-
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.h
5623-
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/TrimPaths.cpp
56245576
FILE: ../../../third_party/skia/samplecode/Sample3D.cpp
56255577
FILE: ../../../third_party/skia/src/core/SkCanvasMatrix.h
56265578
FILE: ../../../third_party/skia/src/core/SkM44.cpp
@@ -6791,6 +6743,43 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
67916743
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
67926744
====================================================================================================
67936745

6746+
====================================================================================================
6747+
LIBRARY: skia
6748+
ORIGIN: ../../../third_party/skia/src/core/SkVM_fwd.h + ../../../third_party/skia/LICENSE
6749+
TYPE: LicenseType.bsd
6750+
FILE: ../../../third_party/skia/src/core/SkVM_fwd.h
6751+
----------------------------------------------------------------------------------------------------
6752+
Copyright 2020 Google LLC
6753+
6754+
Redistribution and use in source and binary forms, with or without
6755+
modification, are permitted provided that the following conditions are
6756+
met:
6757+
6758+
* Redistributions of source code must retain the above copyright
6759+
notice, this list of conditions and the following disclaimer.
6760+
6761+
* Redistributions in binary form must reproduce the above copyright
6762+
notice, this list of conditions and the following disclaimer in
6763+
the documentation and/or other materials provided with the
6764+
distribution.
6765+
6766+
* Neither the name of the copyright holder nor the names of its
6767+
contributors may be used to endorse or promote products derived
6768+
from this software without specific prior written permission.
6769+
6770+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6771+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6772+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6773+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6774+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6775+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6776+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6777+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6778+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6779+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6780+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6781+
====================================================================================================
6782+
67946783
====================================================================================================
67956784
LIBRARY: skia
67966785
ORIGIN: ../../../third_party/skia/src/gpu/GrDistanceFieldGenFromVector.cpp + ../../../third_party/skia/LICENSE

0 commit comments

Comments
 (0)