diff --git a/DEPS b/DEPS index 5aebe4a9a4452..a405176dc99a9 100644 --- a/DEPS +++ b/DEPS @@ -27,7 +27,7 @@ vars = { 'skia_git': 'https://skia.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': '48d421cc98118640a59863c156e5b266c4f298d1', + 'skia_revision': '4a375fe2138efdb7d8fc5ab2c1acabb71369bcad', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 98c5c06474e36..71824b15bbd99 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 02ea5504a0f93171f1a1ea14720ae802 +Signature: e9a2c0a84a597b33e1f49f60d2453641 UNUSED LICENSES: @@ -1317,6 +1317,7 @@ FILE: ../../../third_party/skia/src/sksl/analysis/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/codegen/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/dsl/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/dsl/priv/BUILD.bazel +FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl 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 FILE: ../../../third_party/skia/src/sksl/ir/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/lex/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/lex/sksl.lex +FILE: ../../../third_party/skia/src/sksl/sksl_compute.sksl FILE: ../../../third_party/skia/src/sksl/sksl_frag.sksl FILE: ../../../third_party/skia/src/sksl/sksl_gpu.sksl FILE: ../../../third_party/skia/src/sksl/sksl_graphite_frag.sksl @@ -1338,6 +1340,7 @@ FILE: ../../../third_party/skia/src/sksl/sksl_rt_shader.sksl FILE: ../../../third_party/skia/src/sksl/sksl_vert.sksl FILE: ../../../third_party/skia/src/sksl/tracing/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/transform/BUILD.bazel +FILE: ../../../third_party/skia/src/text/BUILD.bazel FILE: ../../../third_party/skia/src/text/gpu/BUILD.bazel FILE: ../../../third_party/skia/src/utils/BUILD.bazel FILE: ../../../third_party/skia/src/xml/BUILD.bazel @@ -5957,6 +5960,7 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.cpp FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.h FILE: ../../../third_party/skia/src/gpu/tessellate/LinearTolerances.h FILE: ../../../third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp +FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetComputeShaderMainParams.cpp FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsSameExpressionTree.cpp FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsTrivialExpression.cpp 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. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/src/core/SkGlyphRun.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkGlyphRunPainter.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/src/core/SkGlyphRun.cpp -FILE: ../../../third_party/skia/src/core/SkGlyphRun.h FILE: ../../../third_party/skia/src/core/SkGlyphRunPainter.cpp FILE: ../../../third_party/skia/src/core/SkGlyphRunPainter.h +FILE: ../../../third_party/skia/src/text/GlyphRun.cpp +FILE: ../../../third_party/skia/src/text/GlyphRun.h ---------------------------------------------------------------------------------------------------- Copyright 2018 The Android Open Source Project