diff --git a/DEPS b/DEPS index a4c97332cb347..07c7bb26ee4d4 100644 --- a/DEPS +++ b/DEPS @@ -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. diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 7d7dce7e032aa..ac5e3abe15630 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 3d8c385791d68843c2f8047733420076 +Signature: baac57f95e8a6be522f532984a0e649e UNUSED LICENSES: @@ -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 @@ -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 @@ -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 @@ -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.