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

Commit 3f52888

Browse files
skia-flutter-autorollbrianosman
skia-flutter-autoroll
authored and
brianosman
committed
Roll src/third_party/skia d445e2b..91e0d75 (44 commits) (#15232)
https://skia.googlesource.com/skia.git/+log/d445e2b6fcf1..91e0d7526944 git log d445e2b..91e0d75 --date=short --first-parent --format='%ad %ae %s' 2020-01-07 mtklein@google.com rm gm/skvm.cpp 2020-01-07 mtklein@google.com thread an SkArenaAlloc into shaders 2020-01-07 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 1031d2c..51e653f (10 commits) 2020-01-07 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/swiftshader 10a900e5ffaf..068dd89cab31 (7 commits) 2020-01-07 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ../src 3beaf136b459..55a27186b7de (337 commits) 2020-01-07 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-07 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-07 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-07 mtklein@google.com handle unpremul in skvm blitter 2020-01-07 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-06 benjaminwagner@google.com Add missing Metal jobs 2020-01-06 mtklein@google.com support kDecal in skvm image shader 2020-01-06 mtklein@google.com expand skvm image shader 2020-01-06 herb@google.com Make fBrokenRun local to doRegen. 2020-01-06 bsalomon@google.com Rename GrSimpleTextureEffect->GrTextureEffect 2020-01-06 benjaminwagner@google.com Remove Win2016 jobs. 2020-01-06 bsalomon@google.com Remove SkIRect::EmptyIRect 2020-01-06 herb@google.com Move the exit code to a common switch 2020-01-06 brianosman@google.com Add a few more SkRuntimeEffect unit tests 2020-01-06 bsalomon@google.com Revert "Revert "Clean up GrSimpleTextureEffect."" 2020-01-06 mtklein@google.com first foray into SkVM image shaders 2020-01-06 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-06 bsalomon@google.com Remove unused varying type param from GrGLSLShaderBuilder texture methods. 2020-01-06 brianosman@google.com Remove SkRuntimeShaderFactory 2020-01-06 robertphillips@google.com Add GrCompressedDimensions helper function 2020-01-06 csmartdalton@google.com Move "set_path_pt" from SampleAAGeometry into ToolUtils 2020-01-06 kjlubick@google.com [canvaskit] Remove support for T1 fonts and reduce code size 2020-01-06 kjlubick@google.com Make tracing data a compile-time option 2020-01-06 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-06 fmalita@chromium.org [skottie] cleanup: move transform & camera adapters to own CUs 2020-01-06 jlavrova@google.com Fix a bug with unresolved text 2020-01-06 csmartdalton@google.com Add a commandline flag to force offscreen rendering in viewer 2020-01-06 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-06 bsalomon@google.com Handle insane number of glyphs in GrAtlasTextOp. 2020-01-06 mtklein@google.com minor SkVMBlitter TODOs 2020-01-06 mtklein@google.com in gm/skvm.cpp, Fade doesn't need to wrap a shader 2020-01-06 jcgregorio@google.com Don't use CIPD_PKG_CPYTHON for P30. 2020-01-06 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-06 kjlubick@google.com [canvaskit] Update test to use correct metrics 2020-01-06 jlavrova@google.com Small bug fixes: leading spaces affect all width measurements, longest line and so on. 2020-01-06 kjlubick@google.com [canvaskit] Add npm release target to ship smaller binaries 2020-01-06 kjlubick@google.com [canvaskit] Add build flag for pathops 2020-01-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 1fdf6ca..1031d2c (5 commits) 2020-01-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ../src a12a9d87841e..3beaf136b459 (315 commits) Created with: gclient setdep -r src/third_party/skia@91e0d7526944 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 jvanverth@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: jvanverth@google.com
1 parent abaac56 commit 3f52888

File tree

3 files changed

+84
-10
lines changed

3 files changed

+84
-10
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': 'd445e2b6fcf1a051049b2e527feb1fca9a0a4946',
29+
'skia_revision': '91e0d7526944f714706ec9510c346bd4eab3d5f1',
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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 52d5a1113113fcff5f331b122101a0a0
1+
Signature: 281b747ba0f64c8a40728d9c9b17b934
22

33
UNUSED LICENSES:
44

@@ -1114,7 +1114,7 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.e
11141114
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json
11151115
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
11161116
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json
1117-
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
1117+
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
11181118
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
11191119
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
11201120
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
@@ -1277,8 +1277,8 @@ FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clan
12771277
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan.json
12781278
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
12791279
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-MSVC-LenovoYogaC630-GPU-Adreno630-arm64-Debug-All-ANGLE.json
1280-
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
1281-
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
1280+
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
1281+
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
12821282
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All.json
12831283
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal.json
12841284
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/failed_dm.json
@@ -1337,6 +1337,7 @@ FILE: ../../../third_party/skia/infra/wasm-common/docker/perf-karma-chrome-tests
13371337
FILE: ../../../third_party/skia/modules/canvaskit/cpu.js
13381338
FILE: ../../../third_party/skia/modules/canvaskit/debug.js
13391339
FILE: ../../../third_party/skia/modules/canvaskit/externs.js
1340+
FILE: ../../../third_party/skia/modules/canvaskit/font.js
13401341
FILE: ../../../third_party/skia/modules/canvaskit/fonts/NotoMono-Regular.ttf
13411342
FILE: ../../../third_party/skia/modules/canvaskit/gpu.js
13421343
FILE: ../../../third_party/skia/modules/canvaskit/helper.js
@@ -1359,6 +1360,7 @@ FILE: ../../../third_party/skia/modules/canvaskit/karma.conf.js
13591360
FILE: ../../../third_party/skia/modules/canvaskit/package.json
13601361
FILE: ../../../third_party/skia/modules/canvaskit/paragraph.js
13611362
FILE: ../../../third_party/skia/modules/canvaskit/particles.js
1363+
FILE: ../../../third_party/skia/modules/canvaskit/pathops.js
13621364
FILE: ../../../third_party/skia/modules/canvaskit/perf/animation.bench.js
13631365
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/confetti.json
13641366
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/drinks.json
@@ -1368,7 +1370,9 @@ FILE: ../../../third_party/skia/modules/canvaskit/postamble.js
13681370
FILE: ../../../third_party/skia/modules/canvaskit/preamble.js
13691371
FILE: ../../../third_party/skia/modules/canvaskit/ready.js
13701372
FILE: ../../../third_party/skia/modules/canvaskit/release.js
1373+
FILE: ../../../third_party/skia/modules/canvaskit/rt_shader.js
13711374
FILE: ../../../third_party/skia/modules/canvaskit/skottie.js
1375+
FILE: ../../../third_party/skia/modules/canvaskit/skp.js
13721376
FILE: ../../../third_party/skia/modules/pathkit/chaining.js
13731377
FILE: ../../../third_party/skia/modules/pathkit/externs.js
13741378
FILE: ../../../third_party/skia/modules/pathkit/helper.js
@@ -3090,7 +3094,6 @@ FILE: ../../../third_party/skia/gm/postercircle.cpp
30903094
FILE: ../../../third_party/skia/gm/samplelocations.cpp
30913095
FILE: ../../../third_party/skia/gm/skbug_8664.cpp
30923096
FILE: ../../../third_party/skia/gm/skbug_8955.cpp
3093-
FILE: ../../../third_party/skia/gm/skvm.cpp
30943097
FILE: ../../../third_party/skia/gm/tessellation.cpp
30953098
FILE: ../../../third_party/skia/gm/video_decoder.cpp
30963099
FILE: ../../../third_party/skia/gm/yuv420_odd_dim.cpp
@@ -3849,8 +3852,8 @@ FILE: ../../../third_party/skia/src/gpu/effects/GrAtlasedShaderHelpers.h
38493852
FILE: ../../../third_party/skia/src/gpu/effects/GrBlurredEdgeFragmentProcessor.fp
38503853
FILE: ../../../third_party/skia/src/gpu/effects/GrCircleEffect.fp
38513854
FILE: ../../../third_party/skia/src/gpu/effects/GrEllipseEffect.fp
3852-
FILE: ../../../third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp
3853-
FILE: ../../../third_party/skia/src/gpu/effects/GrSimpleTextureEffect.h
3855+
FILE: ../../../third_party/skia/src/gpu/effects/GrTextureEffect.cpp
3856+
FILE: ../../../third_party/skia/src/gpu/effects/GrTextureEffect.h
38543857
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp
38553858
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h
38563859
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrCircleEffect.cpp
@@ -4263,7 +4266,6 @@ FILE: ../../../third_party/skia/docs/examples/IPoint_subtract_operator.cpp
42634266
FILE: ../../../third_party/skia/docs/examples/IPoint_subtractfrom_operator.cpp
42644267
FILE: ../../../third_party/skia/docs/examples/IPoint_x.cpp
42654268
FILE: ../../../third_party/skia/docs/examples/IPoint_y.cpp
4266-
FILE: ../../../third_party/skia/docs/examples/IRect_EmptyIRect.cpp
42674269
FILE: ../../../third_party/skia/docs/examples/IRect_Intersects.cpp
42684270
FILE: ../../../third_party/skia/docs/examples/IRect_MakeEmpty.cpp
42694271
FILE: ../../../third_party/skia/docs/examples/IRect_MakeLTRB.cpp
@@ -6088,6 +6090,46 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
60886090
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
60896091
====================================================================================================
60906092

6093+
====================================================================================================
6094+
LIBRARY: skia
6095+
ORIGIN: ../../../third_party/skia/modules/skottie/src/Camera.cpp + ../../../third_party/skia/LICENSE
6096+
TYPE: LicenseType.bsd
6097+
FILE: ../../../third_party/skia/modules/skottie/src/Camera.cpp
6098+
FILE: ../../../third_party/skia/modules/skottie/src/Camera.h
6099+
FILE: ../../../third_party/skia/modules/skottie/src/Transform.cpp
6100+
FILE: ../../../third_party/skia/modules/skottie/src/Transform.h
6101+
----------------------------------------------------------------------------------------------------
6102+
Copyright 2020 Google Inc.
6103+
6104+
Redistribution and use in source and binary forms, with or without
6105+
modification, are permitted provided that the following conditions are
6106+
met:
6107+
6108+
* Redistributions of source code must retain the above copyright
6109+
notice, this list of conditions and the following disclaimer.
6110+
6111+
* Redistributions in binary form must reproduce the above copyright
6112+
notice, this list of conditions and the following disclaimer in
6113+
the documentation and/or other materials provided with the
6114+
distribution.
6115+
6116+
* Neither the name of the copyright holder nor the names of its
6117+
contributors may be used to endorse or promote products derived
6118+
from this software without specific prior written permission.
6119+
6120+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6121+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6122+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6123+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6124+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6125+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6126+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6127+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6128+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6129+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6130+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6131+
====================================================================================================
6132+
60916133
====================================================================================================
60926134
LIBRARY: skia
60936135
ORIGIN: ../../../third_party/skia/samplecode/SampleTextureUpload.cpp + ../../../third_party/skia/LICENSE
@@ -6722,4 +6764,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
67226764
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
67236765
THE SOFTWARE.
67246766
====================================================================================================
6725-
Total license count: 53
6767+
Total license count: 54

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12490,6 +12490,38 @@ skia
1249012490

1249112491
Copyright 2019 The Android Open Source Project
1249212492

12493+
Redistribution and use in source and binary forms, with or without
12494+
modification, are permitted provided that the following conditions are
12495+
met:
12496+
12497+
* Redistributions of source code must retain the above copyright
12498+
notice, this list of conditions and the following disclaimer.
12499+
12500+
* Redistributions in binary form must reproduce the above copyright
12501+
notice, this list of conditions and the following disclaimer in
12502+
the documentation and/or other materials provided with the
12503+
distribution.
12504+
12505+
* Neither the name of the copyright holder nor the names of its
12506+
contributors may be used to endorse or promote products derived
12507+
from this software without specific prior written permission.
12508+
12509+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
12510+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
12511+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
12512+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
12513+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
12514+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
12515+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
12516+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
12517+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
12518+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
12519+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12520+
--------------------------------------------------------------------------------
12521+
skia
12522+
12523+
Copyright 2020 Google Inc.
12524+
1249312525
Redistribution and use in source and binary forms, with or without
1249412526
modification, are permitted provided that the following conditions are
1249512527
met:

0 commit comments

Comments
 (0)