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

Commit a68e431

Browse files
skia-flutter-autorollbrianosman
skia-flutter-autoroll
authored and
brianosman
committed
Roll src/third_party/skia f9aea7f..e4ddb8a (35 commits) (#15931)
https://skia.googlesource.com/skia.git/+log/f9aea7f7e502..e4ddb8a7cddc git log f9aea7f..e4ddb8a --date=short --first-parent --format='%ad %ae %s' 2020-01-23 reed@google.com Revert "Specialize SkRectanzier to SkRectanizerSkyline" 2020-01-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ../src f2517d68dfde..7afe38da7578 (473 commits) 2020-01-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 8c396a9..135f8fc (16 commits) 2020-01-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/swiftshader b766e5e7fbf4..f324fe10ca65 (6 commits) 2020-01-23 herb@google.com Specialize SkRectanzier to SkRectanizerSkyline 2020-01-23 egdaniel@google.com Pass readSwizzle into more proxy creation to not use config. 2020-01-23 egdaniel@google.com Remove GrPixelConfig from GrSurface and GrSurfaceProxy. 2020-01-23 benjaminwagner@google.com Reduce binary size of GCC Debug builds 2020-01-22 robertphillips@google.com Add missing 'GrProtected' parameter to createCompressedTexture call chain 2020-01-22 michaelludwig@google.com Account for negative w in GrQuad::bounds 2020-01-22 jlavrova@google.com Another attempt to aling ellipsis behavior with TxtLib 2020-01-22 awscreen@chromium.org Update font descriptor selection workaround 2020-01-22 michaelludwig@google.com Add GM reproducing perspective failures 2020-01-22 mtklein@google.com extend -O1 hack to avx2 code as well 2020-01-22 benjaminwagner@google.com Revert "Revert "Revert "Complete rewrite of the SkSL interpreter""" 2020-01-22 ethannicholas@google.com let's see what happens 2020-01-22 ethannicholas@google.com derp 2020-01-22 ethannicholas@google.com test change 2020-01-22 ethannicholas@google.com removed extraneous change 2020-01-22 ethannicholas@google.com maybe fixed? 2020-01-22 ethannicholas@google.com Revert "Revert "Complete rewrite of the SkSL interpreter"" 2020-01-22 kjlubick@google.com [canvaskit] Roll to 0.12.0 2020-01-22 kjlubick@google.com [canvaskit] Fix color opaqueness 2020-01-22 kjlubick@google.com [canvaskit] Fix colorType bug 2020-01-22 reed@google.com Revert "Revert "use SkM44 internally"" 2020-01-22 fmalita@chromium.org [skottie] Cleanup: convert shape layer adapters to new pattern 2020-01-22 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-22 bsalomon@google.com Fix usage enum with GL_NV_pixel_buffer_object. 2020-01-22 bungeman@google.com Glyph 0xFFFF is a valid glyph. 2020-01-22 bsalomon@google.com Disable Programs test on TecnoSparkPro3 Debug test bot 2020-01-22 egdaniel@google.com Reland "Reland "Pass in a SkColorType into SkImage_Gpu ctor."" 2020-01-22 michaelludwig@google.com Add GrQuad::bounds() benchmark 2020-01-22 reed@google.com Revert "use SkM44 internally" 2020-01-22 mtklein@google.com add --dylib to fm 2020-01-22 reed@google.com use SkM44 internally Created with: gclient setdep -r src/third_party/skia@e4ddb8a7cddc 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 benjaminwagner@google.com on the revert to ensure that a human is aware of the problem. 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/+/master/autoroll/README.md Bug: None Tbr: benjaminwagner@google.com
1 parent 6d1a6ac commit a68e431

File tree

2 files changed

+52
-41
lines changed

2 files changed

+52
-41
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': 'f9aea7f7e502894a2708063a54175b50ce220ede',
29+
'skia_revision': 'e4ddb8a7cddc6335cf828fce53d9d04f287389d1',
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: 51 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 9e46b0ff096183bbe63eda3c41b2cb3a
1+
Signature: 411fc64fe581574d81cebe1cdf535e30
22

33
UNUSED LICENSES:
44

@@ -3360,7 +3360,6 @@ 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
33643363
FILE: ../../../third_party/skia/modules/skottie/src/SkottieAdapter.h
33653364
FILE: ../../../third_party/skia/modules/skottie/src/SkottieJson.cpp
33663365
FILE: ../../../third_party/skia/modules/skottie/src/SkottieJson.h
@@ -3369,8 +3368,8 @@ FILE: ../../../third_party/skia/modules/skottie/src/SkottieProperty.cpp
33693368
FILE: ../../../third_party/skia/modules/skottie/src/SkottieTest.cpp
33703369
FILE: ../../../third_party/skia/modules/skottie/src/SkottieTool.cpp
33713370
FILE: ../../../third_party/skia/modules/skottie/src/layers/PrecompLayer.cpp
3372-
FILE: ../../../third_party/skia/modules/skottie/src/layers/ShapeLayer.cpp
33733371
FILE: ../../../third_party/skia/modules/skottie/src/layers/TextLayer.cpp
3372+
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.cpp
33743373
FILE: ../../../third_party/skia/modules/skottie/utils/SkottieUtils.cpp
33753374
FILE: ../../../third_party/skia/modules/skottie/utils/SkottieUtils.h
33763375
FILE: ../../../third_party/skia/modules/sksg/include/SkSGClipEffect.h
@@ -3975,6 +3974,45 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
39753974
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39763975
====================================================================================================
39773976

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+
39784016
====================================================================================================
39794017
LIBRARY: skia
39804018
ORIGIN: ../../../third_party/skia/bench/ParagraphBench.cpp + ../../../third_party/skia/LICENSE
@@ -5567,12 +5605,22 @@ FILE: ../../../third_party/skia/gm/bicubic.cpp
55675605
FILE: ../../../third_party/skia/gm/compressed_textures.cpp
55685606
FILE: ../../../third_party/skia/gm/strokerect_anisotropic.cpp
55695607
FILE: ../../../third_party/skia/include/private/SkM44.h
5608+
FILE: ../../../third_party/skia/modules/skottie/src/Adapter.h
55705609
FILE: ../../../third_party/skia/modules/skottie/src/Animator.cpp
55715610
FILE: ../../../third_party/skia/modules/skottie/src/Animator.h
55725611
FILE: ../../../third_party/skia/modules/skottie/src/Camera.cpp
55735612
FILE: ../../../third_party/skia/modules/skottie/src/Camera.h
55745613
FILE: ../../../third_party/skia/modules/skottie/src/Transform.cpp
55755614
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
55765624
FILE: ../../../third_party/skia/samplecode/Sample3D.cpp
55775625
FILE: ../../../third_party/skia/src/core/SkCanvasMatrix.h
55785626
FILE: ../../../third_party/skia/src/core/SkM44.cpp
@@ -6743,43 +6791,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
67436791
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
67446792
====================================================================================================
67456793

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-
67836794
====================================================================================================
67846795
LIBRARY: skia
67856796
ORIGIN: ../../../third_party/skia/src/gpu/GrDistanceFieldGenFromVector.cpp + ../../../third_party/skia/LICENSE

0 commit comments

Comments
 (0)