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

Roll Skia from 8cc118dce813 to c3794dd52778 (27 revisions) #20173

Merged
merged 1 commit into from
Jul 31, 2020
Merged

Roll Skia from 8cc118dce813 to c3794dd52778 (27 revisions) #20173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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': '8cc118dce81392f94da2a05de41a48fb34f54b1f',
'skia_revision': 'c3794dd52778552a9afc323f2a9d11905e432a9b',

# 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
19 changes: 9 additions & 10 deletions ci/licenses_golden/licenses_skia
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: c7ee484f0bf49aed48999011c8ec793c
Signature: 6888632fda3913e222404b942deccd12

UNUSED LICENSES:

Expand Down Expand Up @@ -3325,7 +3325,6 @@ FILE: ../../../third_party/skia/src/core/SkCanvasPriv.cpp
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformSteps.cpp
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformSteps.h
FILE: ../../../third_party/skia/src/core/SkContourMeasure.cpp
FILE: ../../../third_party/skia/src/core/SkCoverageModePriv.h
FILE: ../../../third_party/skia/src/core/SkCubicMap.cpp
FILE: ../../../third_party/skia/src/core/SkCubicSolver.h
FILE: ../../../third_party/skia/src/core/SkDeferredDisplayList.cpp
Expand Down Expand Up @@ -5163,10 +5162,10 @@ FILE: ../../../third_party/skia/src/gpu/ccpr/GrStencilAtlasOp.h
FILE: ../../../third_party/skia/src/gpu/effects/GrComposeLerpEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpEffect.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellateOp.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellateOp.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStencilPathShader.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStencilPathShader.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatePathOp.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatePathOp.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellationPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellationPathRenderer.h
FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.cpp
Expand Down Expand Up @@ -5208,9 +5207,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/bench/TessellatePathBench.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/bench/TessellateBench.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/bench/TessellatePathBench.cpp
FILE: ../../../third_party/skia/bench/TessellateBench.cpp
FILE: ../../../third_party/skia/experimental/skrive/include/SkRive.h
FILE: ../../../third_party/skia/experimental/skrive/src/Artboard.cpp
FILE: ../../../third_party/skia/experimental/skrive/src/Color.cpp
Expand Down Expand Up @@ -5534,10 +5533,10 @@ FILE: ../../../third_party/skia/src/gpu/GrFinishCallbacks.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrFillPathShader.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrFillPathShader.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathShader.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellateStrokeOp.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellateStrokeOp.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellateStrokeShader.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellateStrokeShader.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeTessellateOp.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeTessellateOp.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeTessellateShader.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeTessellateShader.h
FILE: ../../../third_party/skia/src/opts/SkVM_opts.h
FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.cpp
----------------------------------------------------------------------------------------------------
Expand Down