diff --git a/DEPS b/DEPS index 328808d5fdd5fb12b2ed86d4daa36651bf3faa86..446e320153846f4c83d8bc44226e9197b64cd122 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': 'c2c1b0c460ec0e70f79b1382d13778f28d24e599', + 'skia_revision': '49e5b3a339ed18e7bdd7ff8dd4e852d51f051775', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 9c1ed0c7c2acdd357a19fd94948abf89f7977d8c..3ee4d4760812348c4ab804e2bc7571f153d26d8d 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 6e3edfca6bcd6b11872cd4c787b9a8f0 +Signature: 152dba8219ad4e1fa610419c6eca4c13 UNUSED LICENSES: @@ -2563,8 +2563,6 @@ FILE: ../../../third_party/skia/src/gpu/vk/GrVkTexture.cpp FILE: ../../../third_party/skia/src/gpu/vk/GrVkTexture.h FILE: ../../../third_party/skia/src/gpu/vk/GrVkTextureRenderTarget.cpp FILE: ../../../third_party/skia/src/gpu/vk/GrVkTextureRenderTarget.h -FILE: ../../../third_party/skia/src/gpu/vk/GrVkTransferBuffer.cpp -FILE: ../../../third_party/skia/src/gpu/vk/GrVkTransferBuffer.h FILE: ../../../third_party/skia/src/gpu/vk/GrVkUtil.cpp FILE: ../../../third_party/skia/src/gpu/vk/GrVkUtil.h FILE: ../../../third_party/skia/src/image/SkImage_Gpu.h @@ -3482,7 +3480,6 @@ FILE: ../../../third_party/skia/src/gpu/GrBackendTextureImageGenerator.cpp FILE: ../../../third_party/skia/src/gpu/GrBackendTextureImageGenerator.h FILE: ../../../third_party/skia/src/gpu/GrColorInfo.cpp FILE: ../../../third_party/skia/src/gpu/GrColorInfo.h -FILE: ../../../third_party/skia/src/gpu/GrDeferredProxyUploader.h FILE: ../../../third_party/skia/src/gpu/GrDeferredUpload.h FILE: ../../../third_party/skia/src/gpu/GrOnFlushResourceProvider.cpp FILE: ../../../third_party/skia/src/gpu/GrOnFlushResourceProvider.h @@ -3494,7 +3491,6 @@ FILE: ../../../third_party/skia/src/gpu/GrSemaphore.h FILE: ../../../third_party/skia/src/gpu/GrStencilClip.h FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxyPriv.h FILE: ../../../third_party/skia/src/gpu/GrTextureProxyCacheAccess.h -FILE: ../../../third_party/skia/src/gpu/GrTextureProxyPriv.h FILE: ../../../third_party/skia/src/gpu/SkGr.h FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCAtlas.cpp FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCAtlas.h @@ -5988,6 +5984,7 @@ FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp FILE: ../../../third_party/skia/modules/svg/src/SkSVGImage.cpp FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp +FILE: ../../../third_party/skia/src/gpu/GrDrawIndirectCommand.h FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h FILE: ../../../third_party/skia/src/gpu/mock/GrMockRenderTask.h