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

Roll Skia from 059798f40eac to 17dc658f29e5 (1 revision) #28133

Merged
merged 1 commit into from
Aug 17, 2021
Merged

Roll Skia from 059798f40eac to 17dc658f29e5 (1 revision) #28133

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': '059798f40eac55f3532e7b601056f82ead38059e',
'skia_revision': '17dc658f29e57d5a889b0841d3adf674173b2b84',

# 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
12 changes: 6 additions & 6 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: 3d8c385791d68843c2f8047733420076
Signature: baac57f95e8a6be522f532984a0e649e

UNUSED LICENSES:

Expand Down Expand Up @@ -1578,7 +1578,7 @@ FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.h
FILE: ../../../third_party/skia/src/gpu/ops/GrDashOp.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrDashOp.h
FILE: ../../../third_party/skia/src/gpu/ops/GrSmallPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/SmallPathRenderer.h
FILE: ../../../third_party/skia/src/image/SkReadPixelsRec.h
FILE: ../../../third_party/skia/src/image/SkSurface_Gpu.h
FILE: ../../../third_party/skia/src/pathops/SkOpBuilder.cpp
Expand Down Expand Up @@ -2118,8 +2118,6 @@ FILE: ../../../third_party/skia/src/gpu/GrSWMaskHelper.cpp
FILE: ../../../third_party/skia/src/gpu/GrSWMaskHelper.h
FILE: ../../../third_party/skia/src/gpu/GrShaderCaps.cpp
FILE: ../../../third_party/skia/src/gpu/GrShaderCaps.h
FILE: ../../../third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/GrSoftwarePathRenderer.h
FILE: ../../../third_party/skia/src/gpu/GrSurface.cpp
FILE: ../../../third_party/skia/src/gpu/GrSurface.h
FILE: ../../../third_party/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
Expand All @@ -2131,6 +2129,8 @@ 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/SoftwarePathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/SoftwarePathRenderer.h
FILE: ../../../third_party/skia/src/image/SkImage.cpp
FILE: ../../../third_party/skia/src/image/SkImage_Base.h
FILE: ../../../third_party/skia/src/image/SkImage_Gpu.cpp
Expand Down Expand Up @@ -7273,9 +7273,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/gpu/ops/GrSmallPathRenderer.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/ops/SmallPathRenderer.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/gpu/ops/GrSmallPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/SmallPathRenderer.cpp
----------------------------------------------------------------------------------------------------
Copyright 2014 Google Inc.
Copyright 2017 ARM Ltd.
Expand Down