Skip to content

Commit 6498b73

Browse files
Roll Skia from 48d421cc9811 to 4a375fe2138e (6 revisions) (flutter#34088)
1 parent fff144c commit 6498b73

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ vars = {
2727
'skia_git': 'https://skia.googlesource.com',
2828
# OCMock is for testing only so there is no google clone
2929
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
30-
'skia_revision': '48d421cc98118640a59863c156e5b266c4f298d1',
30+
'skia_revision': '4a375fe2138efdb7d8fc5ab2c1acabb71369bcad',
3131

3232
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
3333
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

ci/licenses_golden/licenses_skia

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 02ea5504a0f93171f1a1ea14720ae802
1+
Signature: e9a2c0a84a597b33e1f49f60d2453641
22

33
UNUSED LICENSES:
44

@@ -1317,6 +1317,7 @@ FILE: ../../../third_party/skia/src/sksl/analysis/BUILD.bazel
13171317
FILE: ../../../third_party/skia/src/sksl/codegen/BUILD.bazel
13181318
FILE: ../../../third_party/skia/src/sksl/dsl/BUILD.bazel
13191319
FILE: ../../../third_party/skia/src/sksl/dsl/priv/BUILD.bazel
1320+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.dehydrated.sksl
13201321
FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl
13211322
FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl
13221323
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.dehydrated.sksl
@@ -1329,6 +1330,7 @@ FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.dehydrated.sksl
13291330
FILE: ../../../third_party/skia/src/sksl/ir/BUILD.bazel
13301331
FILE: ../../../third_party/skia/src/sksl/lex/BUILD.bazel
13311332
FILE: ../../../third_party/skia/src/sksl/lex/sksl.lex
1333+
FILE: ../../../third_party/skia/src/sksl/sksl_compute.sksl
13321334
FILE: ../../../third_party/skia/src/sksl/sksl_frag.sksl
13331335
FILE: ../../../third_party/skia/src/sksl/sksl_gpu.sksl
13341336
FILE: ../../../third_party/skia/src/sksl/sksl_graphite_frag.sksl
@@ -1338,6 +1340,7 @@ FILE: ../../../third_party/skia/src/sksl/sksl_rt_shader.sksl
13381340
FILE: ../../../third_party/skia/src/sksl/sksl_vert.sksl
13391341
FILE: ../../../third_party/skia/src/sksl/tracing/BUILD.bazel
13401342
FILE: ../../../third_party/skia/src/sksl/transform/BUILD.bazel
1343+
FILE: ../../../third_party/skia/src/text/BUILD.bazel
13411344
FILE: ../../../third_party/skia/src/text/gpu/BUILD.bazel
13421345
FILE: ../../../third_party/skia/src/utils/BUILD.bazel
13431346
FILE: ../../../third_party/skia/src/xml/BUILD.bazel
@@ -5957,6 +5960,7 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.cpp
59575960
FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.h
59585961
FILE: ../../../third_party/skia/src/gpu/tessellate/LinearTolerances.h
59595962
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp
5963+
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetComputeShaderMainParams.cpp
59605964
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsSameExpressionTree.cpp
59615965
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsTrivialExpression.cpp
59625966
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLNoOpErrorReporter.h
@@ -7492,12 +7496,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
74927496

74937497
====================================================================================================
74947498
LIBRARY: skia
7495-
ORIGIN: ../../../third_party/skia/src/core/SkGlyphRun.cpp + ../../../third_party/skia/LICENSE
7499+
ORIGIN: ../../../third_party/skia/src/core/SkGlyphRunPainter.cpp + ../../../third_party/skia/LICENSE
74967500
TYPE: LicenseType.bsd
7497-
FILE: ../../../third_party/skia/src/core/SkGlyphRun.cpp
7498-
FILE: ../../../third_party/skia/src/core/SkGlyphRun.h
74997501
FILE: ../../../third_party/skia/src/core/SkGlyphRunPainter.cpp
75007502
FILE: ../../../third_party/skia/src/core/SkGlyphRunPainter.h
7503+
FILE: ../../../third_party/skia/src/text/GlyphRun.cpp
7504+
FILE: ../../../third_party/skia/src/text/GlyphRun.h
75017505
----------------------------------------------------------------------------------------------------
75027506
Copyright 2018 The Android Open Source Project
75037507

0 commit comments

Comments
 (0)