diff --git a/DEPS b/DEPS index 626ba1da148c4..3081fed57a383 100644 --- a/DEPS +++ b/DEPS @@ -18,7 +18,7 @@ vars = { 'llvm_git': 'https://llvm.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': 'c969e4aff32ca47ef0755c2a7d269a7a532a5ff3', + 'skia_revision': 'ea839690b97d34e9e24b4237dd0a1522073d8591', # 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 a543ae1a9877b..76fda2896d081 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: fb5883a71c45eeef7a1dfd4e67517a74 +Signature: 7dc84feb910de83ff45abc19a3297659 ==================================================================================================== LIBRARY: etc1 @@ -386,6 +386,7 @@ FILE: ../../../third_party/skia/modules/pathkit/perf/pathops.bench.js FILE: ../../../third_party/skia/modules/pathkit/perf/perfReporter.js FILE: ../../../third_party/skia/modules/skparagraph/test.html FILE: ../../../third_party/skia/package-lock.json +FILE: ../../../third_party/skia/relnotes/grsurface-info.md FILE: ../../../third_party/skia/relnotes/mesh.md FILE: ../../../third_party/skia/relnotes/readbuffer-deserial.md FILE: ../../../third_party/skia/relnotes/vk-directcontext.md @@ -7314,7 +7315,6 @@ ORIGIN: ../../../third_party/skia/gm/mesh.cpp + ../../../third_party/skia/LICENS ORIGIN: ../../../third_party/skia/include/core/SkBlender.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkMesh.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/effects/SkBlenders.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/include/gpu/GrSurfaceInfo.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/ShaderErrorHandler.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h + ../../../third_party/skia/LICENSE @@ -7351,7 +7351,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.cpp + ../../.. ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrOpsTypes.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrPersistentCacheUtils.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrSurfaceInfo.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.cpp + ../../../third_party/skia/LICENSE @@ -7531,7 +7530,6 @@ FILE: ../../../third_party/skia/gm/mesh.cpp FILE: ../../../third_party/skia/include/core/SkBlender.h FILE: ../../../third_party/skia/include/core/SkMesh.h FILE: ../../../third_party/skia/include/effects/SkBlenders.h -FILE: ../../../third_party/skia/include/gpu/GrSurfaceInfo.h FILE: ../../../third_party/skia/include/gpu/ShaderErrorHandler.h FILE: ../../../third_party/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h FILE: ../../../third_party/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h @@ -7568,7 +7566,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrOpsTypes.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrPersistentCacheUtils.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/GrSurfaceInfo.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.cpp