Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ vars = {
'fuchsia_git': 'https://fuchsia.googlesource.com',
'github_git': 'https://github.com',
'skia_git': 'https://skia.googlesource.com',
'skia_revision': '74c6ed3d1f179209ec90025532310d9c8151999f',
'skia_revision': '1935aa3d27cd4ed4aef2dc04360f247a541d4b00',

# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
Expand Down
21 changes: 14 additions & 7 deletions travis/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 6e79e19c58b6006b6ff5d8015a97ee9a
Signature: 9c29063abe2e1277814ba6aeb49290f1

UNUSED LICENSES:

Expand Down Expand Up @@ -1438,9 +1438,6 @@ FILE: ../../../third_party/skia/src/gpu/effects/GrConfigConversionEffect.h
FILE: ../../../third_party/skia/src/gpu/effects/GrConstColorProcessor.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrConstColorProcessor.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrConstColorProcessor.h
FILE: ../../../third_party/skia/src/gpu/effects/GrDitherEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrDitherEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrDitherEffect.h
FILE: ../../../third_party/skia/src/gpu/effects/GrLumaColorFilterEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrLumaColorFilterEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrLumaColorFilterEffect.h
Expand All @@ -1459,13 +1456,21 @@ FILE: ../../../third_party/skia/src/gpu/effects/GrRRectBlurEffect.h
FILE: ../../../third_party/skia/src/gpu/effects/GrRectBlurEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrRectBlurEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrRectBlurEffect.h
FILE: ../../../third_party/skia/src/gpu/effects/GrSkSLFP.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrSkSLFP.h
FILE: ../../../third_party/skia/src/gpu/effects/GrUnpremulInputFragmentProcessor.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrUnpremulInputFragmentProcessor.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrUnpremulInputFragmentProcessor.h
FILE: ../../../third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyManager.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyManager.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyPipelineState.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyPipelineState.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlGpuCommandBuffer.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlResourceProvider.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlResourceProvider.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlTextureRenderTarget.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlTextureRenderTarget.mm
FILE: ../../../third_party/skia/src/gpu/ops/GrClearStencilClipOp.cpp
Expand All @@ -1488,6 +1493,7 @@ FILE: ../../../third_party/skia/src/sksl/SkSLInterpreter.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLInterpreter.h
FILE: ../../../third_party/skia/src/sksl/SkSLJIT.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLJIT.h
FILE: ../../../third_party/skia/src/sksl/SkSLPipelineStageCodeGenerator.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLAppendStage.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariableReference.cpp
FILE: ../../../third_party/skia/src/utils/Sk3D.cpp
Expand Down Expand Up @@ -2252,10 +2258,10 @@ FILE: ../../../third_party/skia/site/user/sample/transfer_fn.png
FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h
FILE: ../../../third_party/skia/src/sksl/lex/sksl.lex
FILE: ../../../third_party/skia/src/sksl/sksl.inc
FILE: ../../../third_party/skia/src/sksl/sksl_cpu.inc
FILE: ../../../third_party/skia/src/sksl/sksl_fp.inc
FILE: ../../../third_party/skia/src/sksl/sksl_frag.inc
FILE: ../../../third_party/skia/src/sksl/sksl_geom.inc
FILE: ../../../third_party/skia/src/sksl/sksl_pipeline.inc
FILE: ../../../third_party/skia/src/sksl/sksl_vert.inc
----------------------------------------------------------------------------------------------------
Copyright (c) 2011 Google Inc. All rights reserved.
Expand Down Expand Up @@ -2752,10 +2758,9 @@ FILE: ../../../third_party/skia/src/gpu/GrDefaultGeoProcFactory.cpp
FILE: ../../../third_party/skia/src/gpu/GrDefaultGeoProcFactory.h
FILE: ../../../third_party/skia/src/gpu/GrFragmentProcessor.h
FILE: ../../../third_party/skia/src/gpu/GrGpuResourceCacheAccess.h
FILE: ../../../third_party/skia/src/gpu/GrGpuResourceRef.cpp
FILE: ../../../third_party/skia/src/gpu/GrGpuResourceRef.h
FILE: ../../../third_party/skia/src/gpu/GrPathRendering.cpp
FILE: ../../../third_party/skia/src/gpu/GrPathRendering.h
FILE: ../../../third_party/skia/src/gpu/GrPendingIOResource.h
FILE: ../../../third_party/skia/src/gpu/GrPendingProgramElement.h
FILE: ../../../third_party/skia/src/gpu/GrPrimitiveProcessor.cpp
FILE: ../../../third_party/skia/src/gpu/GrProcessorAnalysis.cpp
Expand Down Expand Up @@ -4143,6 +4148,7 @@ FILE: ../../../third_party/skia/src/sksl/SkSLHCodeGenerator.h
FILE: ../../../third_party/skia/src/sksl/SkSLLexer.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLLexer.h
FILE: ../../../third_party/skia/src/sksl/SkSLOutputStream.h
FILE: ../../../third_party/skia/src/sksl/SkSLPipelineStageCodeGenerator.h
FILE: ../../../third_party/skia/src/sksl/SkSLSectionAndParameterHelper.h
FILE: ../../../third_party/skia/src/sksl/SkSLString.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLString.h
Expand Down Expand Up @@ -4276,6 +4282,7 @@ TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/experimental/wasm/wasm_main.cpp
FILE: ../../../third_party/skia/fuzz/FuzzEncoders.cpp
FILE: ../../../third_party/skia/fuzz/FuzzPolyUtils.cpp
FILE: ../../../third_party/skia/include/private/GrSkSLFPFactoryCache.h
----------------------------------------------------------------------------------------------------
Copyright 2018 Google LLC

Expand Down