Skip to content

Commit daf0ede

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll src/third_party/skia 6417060..340aeda (41 commits) (flutter#7205)
https://skia.googlesource.com/skia.git/+log/6417060b1c23..340aeda6b3ba Created with: gclient setdep -r src/third_party/skia@340aeda6b3ba The AutoRoll server is located here: https://autoroll.skia.org/r/skia-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary.
1 parent 793a08b commit daf0ede

File tree

2 files changed

+22
-17
lines changed

2 files changed

+22
-17
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ vars = {
2323
'fuchsia_git': 'https://fuchsia.googlesource.com',
2424
'github_git': 'https://github.com',
2525
'skia_git': 'https://skia.googlesource.com',
26-
'skia_revision': '6417060b1c2330919c6af1a63570752a4c473674',
26+
'skia_revision': '340aeda6b3ba50d145413685661b13edea0d52ad',
2727

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

‎ci/licenses_golden/licenses_skia‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 13fc10881fe243f710665ac16224bbb5
1+
Signature: 904762efaee11ecdcf1b3308f5d174b4
22

33
UNUSED LICENSES:
44

@@ -1312,6 +1312,7 @@ FILE: ../../../third_party/skia/gm/crbug_887103.cpp
13121312
FILE: ../../../third_party/skia/gm/crbug_892988.cpp
13131313
FILE: ../../../third_party/skia/gm/crbug_899512.cpp
13141314
FILE: ../../../third_party/skia/gm/crbug_905548.cpp
1315+
FILE: ../../../third_party/skia/gm/daa.cpp
13151316
FILE: ../../../third_party/skia/gm/drawimageset.cpp
13161317
FILE: ../../../third_party/skia/gm/drawquadset.cpp
13171318
FILE: ../../../third_party/skia/gm/fwidth_squircle.cpp
@@ -1398,6 +1399,7 @@ FILE: ../../../third_party/skia/modules/sksg/src/SkSGPlane.cpp
13981399
FILE: ../../../third_party/skia/modules/sksg/src/SkSGRoundEffect.cpp
13991400
FILE: ../../../third_party/skia/modules/sksg/src/SkSGScene.cpp
14001401
FILE: ../../../third_party/skia/modules/sksg/src/SkSGText.cpp
1402+
FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper.cpp
14011403
FILE: ../../../third_party/skia/samplecode/SampleAnimatedImage.cpp
14021404
FILE: ../../../third_party/skia/samplecode/SampleCusp.cpp
14031405
FILE: ../../../third_party/skia/samplecode/SampleFlutterAnimate.cpp
@@ -1691,7 +1693,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
16911693

16921694
====================================================================================================
16931695
LIBRARY: skcms
1694-
ORIGIN: ../../../third_party/skia/third_party/skcms/LICENSE
1696+
ORIGIN: ../../../third_party/skia/include/third_party/vulkan/LICENSE
16951697
TYPE: LicenseType.bsd
16961698
FILE: ../../../third_party/skia/third_party/skcms/version.sha1
16971699
----------------------------------------------------------------------------------------------------
@@ -1729,19 +1731,19 @@ LIBRARY: skia
17291731
LIBRARY: vulkan
17301732
ORIGIN: ../../../flutter/third_party/txt/LICENSE
17311733
TYPE: LicenseType.apache
1734+
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vk_platform.h
1735+
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan.h
1736+
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_android.h
1737+
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_core.h
1738+
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_ios.h
1739+
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_macos.h
1740+
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_win32.h
1741+
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_xcb.h
17321742
FILE: ../../../third_party/skia/modules/pathkit/npm-asmjs/example.html
17331743
FILE: ../../../third_party/skia/modules/pathkit/npm-asmjs/package.json
17341744
FILE: ../../../third_party/skia/modules/pathkit/npm-wasm/example.html
17351745
FILE: ../../../third_party/skia/modules/pathkit/npm-wasm/package.json
17361746
FILE: ../../../third_party/skia/src/images/SkWebpEncoder.cpp
1737-
FILE: ../../../third_party/skia/third_party/vulkan/vulkan/vk_platform.h
1738-
FILE: ../../../third_party/skia/third_party/vulkan/vulkan/vulkan.h
1739-
FILE: ../../../third_party/skia/third_party/vulkan/vulkan/vulkan_android.h
1740-
FILE: ../../../third_party/skia/third_party/vulkan/vulkan/vulkan_core.h
1741-
FILE: ../../../third_party/skia/third_party/vulkan/vulkan/vulkan_ios.h
1742-
FILE: ../../../third_party/skia/third_party/vulkan/vulkan/vulkan_macos.h
1743-
FILE: ../../../third_party/skia/third_party/vulkan/vulkan/vulkan_win32.h
1744-
FILE: ../../../third_party/skia/third_party/vulkan/vulkan/vulkan_xcb.h
17451747
----------------------------------------------------------------------------------------------------
17461748
Apache License
17471749
Version 2.0, January 2004
@@ -2042,13 +2044,16 @@ FILE: ../../../third_party/skia/docs/overview.bmh
20422044
FILE: ../../../third_party/skia/docs/status.json
20432045
FILE: ../../../third_party/skia/docs/undocumented.bmh
20442046
FILE: ../../../third_party/skia/docs/usingBookmaker.bmh
2047+
FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/Roboto-Regular.ttf
2048+
FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/Roboto-Regular.woff
20452049
FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/example.html
20462050
FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/node.example.js
20472051
FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/package.json
20482052
FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/test.png
20492053
FILE: ../../../third_party/skia/experimental/canvaskit/cpu.js
20502054
FILE: ../../../third_party/skia/experimental/canvaskit/debug.js
20512055
FILE: ../../../third_party/skia/experimental/canvaskit/externs.js
2056+
FILE: ../../../third_party/skia/experimental/canvaskit/fonts/NotoMono-Regular.ttf
20522057
FILE: ../../../third_party/skia/experimental/canvaskit/gpu.js
20532058
FILE: ../../../third_party/skia/experimental/canvaskit/helper.js
20542059
FILE: ../../../third_party/skia/experimental/canvaskit/htmlcanvas/_namedcolors.js
@@ -2140,6 +2145,7 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.ex
21402145
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-OpenCL.json
21412146
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json
21422147
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SafeStack.json
2148+
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Tidy.json
21432149
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ASAN.json
21442150
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json
21452151
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json
@@ -2330,7 +2336,6 @@ FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/failed_get_hash
23302336
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/failed_pull.json
23312337
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/failed_push.json
23322338
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/internal_bot_2.json
2333-
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/internal_bot_5.json
23342339
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/trybot.json
23352340
FILE: ../../../third_party/skia/infra/bots/recipes/test_canvaskit.expected/Test-Debian9-EMCC-GCE-GPU-WEBGL1-wasm-Debug-All-CanvasKit.json
23362341
FILE: ../../../third_party/skia/infra/bots/recipes/test_canvaskit.expected/canvaskit_trybot.json
@@ -2802,6 +2807,7 @@ FILE: ../../../third_party/skia/include/core/SkMatrix44.h
28022807
FILE: ../../../third_party/skia/include/core/SkSize.h
28032808
FILE: ../../../third_party/skia/include/core/SkTLazy.h
28042809
FILE: ../../../third_party/skia/include/effects/SkLayerDrawLooper.h
2810+
FILE: ../../../third_party/skia/include/gpu/GrRenderTarget.h
28052811
FILE: ../../../third_party/skia/include/gpu/GrTexture.h
28062812
FILE: ../../../third_party/skia/include/gpu/gl/GrGLConfig.h
28072813
FILE: ../../../third_party/skia/include/gpu/gl/GrGLConfig_chrome.h
@@ -2920,7 +2926,6 @@ FILE: ../../../third_party/skia/src/gpu/GrPathRendererChain.h
29202926
FILE: ../../../third_party/skia/src/gpu/GrPathUtils.cpp
29212927
FILE: ../../../third_party/skia/src/gpu/GrPathUtils.h
29222928
FILE: ../../../third_party/skia/src/gpu/GrRenderTarget.cpp
2923-
FILE: ../../../third_party/skia/src/gpu/GrRenderTarget.h
29242929
FILE: ../../../third_party/skia/src/gpu/GrStencilAttachment.cpp
29252930
FILE: ../../../third_party/skia/src/gpu/GrStencilAttachment.h
29262931
FILE: ../../../third_party/skia/src/gpu/GrStencilSettings.cpp
@@ -3101,11 +3106,11 @@ FILE: ../../../third_party/skia/include/core/SkMultiPictureDraw.h
31013106
FILE: ../../../third_party/skia/include/core/SkPictureRecorder.h
31023107
FILE: ../../../third_party/skia/include/core/SkSurfaceProps.h
31033108
FILE: ../../../third_party/skia/include/core/SkTextBlob.h
3109+
FILE: ../../../third_party/skia/include/gpu/GrGpuResource.h
3110+
FILE: ../../../third_party/skia/include/gpu/GrResourceKey.h
31043111
FILE: ../../../third_party/skia/include/gpu/gl/GrGLAssembleInterface.h
31053112
FILE: ../../../third_party/skia/include/ports/SkFontMgr_indirect.h
31063113
FILE: ../../../third_party/skia/include/ports/SkRemotableFontMgr.h
3107-
FILE: ../../../third_party/skia/include/private/GrGpuResource.h
3108-
FILE: ../../../third_party/skia/include/private/GrResourceKey.h
31093114
FILE: ../../../third_party/skia/include/private/SkHalf.h
31103115
FILE: ../../../third_party/skia/samplecode/SampleHT.cpp
31113116
FILE: ../../../third_party/skia/samplecode/SampleIdentityScale.cpp
@@ -3315,9 +3320,9 @@ FILE: ../../../third_party/skia/include/core/SkImage.h
33153320
FILE: ../../../third_party/skia/include/core/SkRRect.h
33163321
FILE: ../../../third_party/skia/include/core/SkStrokeRec.h
33173322
FILE: ../../../third_party/skia/include/core/SkSurface.h
3323+
FILE: ../../../third_party/skia/include/gpu/GrSurface.h
33183324
FILE: ../../../third_party/skia/include/gpu/gl/GrGLFunctions.h
33193325
FILE: ../../../third_party/skia/include/pathops/SkPathOps.h
3320-
FILE: ../../../third_party/skia/include/private/GrSurface.h
33213326
FILE: ../../../third_party/skia/include/private/SkChecksum.h
33223327
FILE: ../../../third_party/skia/include/private/SkPathRef.h
33233328
FILE: ../../../third_party/skia/include/private/SkTInternalLList.h
@@ -3597,12 +3602,12 @@ FILE: ../../../third_party/skia/include/core/SkTraceMemoryDump.h
35973602
FILE: ../../../third_party/skia/include/effects/SkImageSource.h
35983603
FILE: ../../../third_party/skia/include/effects/SkTableColorFilter.h
35993604
FILE: ../../../third_party/skia/include/gpu/GrContextOptions.h
3605+
FILE: ../../../third_party/skia/include/gpu/GrSamplerState.h
36003606
FILE: ../../../third_party/skia/include/gpu/gl/GrGLTypes.h
36013607
FILE: ../../../third_party/skia/include/ports/SkFontMgr_android.h
36023608
FILE: ../../../third_party/skia/include/ports/SkFontMgr_directory.h
36033609
FILE: ../../../third_party/skia/include/ports/SkFontMgr_empty.h
36043610
FILE: ../../../third_party/skia/include/ports/SkFontMgr_fontconfig.h
3605-
FILE: ../../../third_party/skia/include/private/GrSamplerState.h
36063611
FILE: ../../../third_party/skia/include/private/SkMutex.h
36073612
FILE: ../../../third_party/skia/include/private/SkNx.h
36083613
FILE: ../../../third_party/skia/include/private/SkNx_neon.h

0 commit comments

Comments
 (0)