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

Roll Skia from fdcf153f6caa to b0697081b529 (2 revisions) #28150

Merged
merged 1 commit into from
Aug 18, 2021
Merged

Roll Skia from fdcf153f6caa to b0697081b529 (2 revisions) #28150

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 @@ -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': 'fdcf153f6caa6a1e9c24080fa329aba7e9083327',
'skia_revision': 'b0697081b5293fcee2a4a63bef36c8789c827da4',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down
22 changes: 11 additions & 11 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: 98db5194a0f103aa503050fec4dc20fa
Signature: a71c772f405aebc04192d81a402f30b7

UNUSED LICENSES:

Expand Down Expand Up @@ -1338,10 +1338,10 @@ FILE: ../../../third_party/skia/src/gpu/gl/mac/GrGLMakeNativeInterface_mac.cpp
FILE: ../../../third_party/skia/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSL.cpp
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSL.h
FILE: ../../../third_party/skia/src/gpu/ops/GrAAHairLinePathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrAAHairLinePathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/GrDefaultPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrDefaultPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/AAHairLinePathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/AAHairLinePathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/DefaultPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/DefaultPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/v1/Device.cpp
FILE: ../../../third_party/skia/src/pdf/SkPDFDevice.cpp
FILE: ../../../third_party/skia/src/pdf/SkPDFDevice.h
Expand Down Expand Up @@ -2127,8 +2127,8 @@ FILE: ../../../third_party/skia/src/gpu/gl/GrGLCaps.h
FILE: ../../../third_party/skia/src/gpu/gl/GrGLProgramDataManager.cpp
FILE: ../../../third_party/skia/src/gpu/gl/GrGLProgramDataManager.h
FILE: ../../../third_party/skia/src/gpu/gl/GrGLUtil.h
FILE: ../../../third_party/skia/src/gpu/ops/GrAAConvexPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrAAConvexPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/AAConvexPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/AAConvexPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/SoftwarePathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/SoftwarePathRenderer.h
FILE: ../../../third_party/skia/src/image/SkImage.cpp
Expand Down Expand Up @@ -2490,13 +2490,13 @@ FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLProgramDataManager.h
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLUniformHandler.h
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLVarying.cpp
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLVarying.h
FILE: ../../../third_party/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/AALinearizingConvexPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/AALinearizingConvexPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/DashLinePathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/DashLinePathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/GrAtlasTextOp.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrAtlasTextOp.h
FILE: ../../../third_party/skia/src/gpu/ops/GrClearOp.h
FILE: ../../../third_party/skia/src/gpu/ops/GrDashLinePathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrDashLinePathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/GrDrawAtlasOp.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrDrawAtlasOp.h
FILE: ../../../third_party/skia/src/gpu/ops/GrDrawOp.h
Expand Down