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

Commit f95b3aa

Browse files
Roll Skia from 059798f40eac to 17dc658f29e5 (1 revision) (#28133)
1 parent 0cced10 commit f95b3aa

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ vars = {
2727
'skia_git': 'https://skia.googlesource.com',
2828
# OCMock is for testing only so there is no google clone
2929
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
30-
'skia_revision': '059798f40eac55f3532e7b601056f82ead38059e',
30+
'skia_revision': '17dc658f29e57d5a889b0841d3adf674173b2b84',
3131

3232
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
3333
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

ci/licenses_golden/licenses_skia

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 3d8c385791d68843c2f8047733420076
1+
Signature: baac57f95e8a6be522f532984a0e649e
22

33
UNUSED LICENSES:
44

@@ -1578,7 +1578,7 @@ FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp
15781578
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.h
15791579
FILE: ../../../third_party/skia/src/gpu/ops/GrDashOp.cpp
15801580
FILE: ../../../third_party/skia/src/gpu/ops/GrDashOp.h
1581-
FILE: ../../../third_party/skia/src/gpu/ops/GrSmallPathRenderer.h
1581+
FILE: ../../../third_party/skia/src/gpu/ops/SmallPathRenderer.h
15821582
FILE: ../../../third_party/skia/src/image/SkReadPixelsRec.h
15831583
FILE: ../../../third_party/skia/src/image/SkSurface_Gpu.h
15841584
FILE: ../../../third_party/skia/src/pathops/SkOpBuilder.cpp
@@ -2118,8 +2118,6 @@ FILE: ../../../third_party/skia/src/gpu/GrSWMaskHelper.cpp
21182118
FILE: ../../../third_party/skia/src/gpu/GrSWMaskHelper.h
21192119
FILE: ../../../third_party/skia/src/gpu/GrShaderCaps.cpp
21202120
FILE: ../../../third_party/skia/src/gpu/GrShaderCaps.h
2121-
FILE: ../../../third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp
2122-
FILE: ../../../third_party/skia/src/gpu/GrSoftwarePathRenderer.h
21232121
FILE: ../../../third_party/skia/src/gpu/GrSurface.cpp
21242122
FILE: ../../../third_party/skia/src/gpu/GrSurface.h
21252123
FILE: ../../../third_party/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
@@ -2131,6 +2129,8 @@ FILE: ../../../third_party/skia/src/gpu/gl/GrGLProgramDataManager.h
21312129
FILE: ../../../third_party/skia/src/gpu/gl/GrGLUtil.h
21322130
FILE: ../../../third_party/skia/src/gpu/ops/GrAAConvexPathRenderer.cpp
21332131
FILE: ../../../third_party/skia/src/gpu/ops/GrAAConvexPathRenderer.h
2132+
FILE: ../../../third_party/skia/src/gpu/ops/SoftwarePathRenderer.cpp
2133+
FILE: ../../../third_party/skia/src/gpu/ops/SoftwarePathRenderer.h
21342134
FILE: ../../../third_party/skia/src/image/SkImage.cpp
21352135
FILE: ../../../third_party/skia/src/image/SkImage_Base.h
21362136
FILE: ../../../third_party/skia/src/image/SkImage_Gpu.cpp
@@ -7273,9 +7273,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
72737273

72747274
====================================================================================================
72757275
LIBRARY: skia
7276-
ORIGIN: ../../../third_party/skia/src/gpu/ops/GrSmallPathRenderer.cpp + ../../../third_party/skia/LICENSE
7276+
ORIGIN: ../../../third_party/skia/src/gpu/ops/SmallPathRenderer.cpp + ../../../third_party/skia/LICENSE
72777277
TYPE: LicenseType.bsd
7278-
FILE: ../../../third_party/skia/src/gpu/ops/GrSmallPathRenderer.cpp
7278+
FILE: ../../../third_party/skia/src/gpu/ops/SmallPathRenderer.cpp
72797279
----------------------------------------------------------------------------------------------------
72807280
Copyright 2014 Google Inc.
72817281
Copyright 2017 ARM Ltd.

0 commit comments

Comments
 (0)