diff --git a/DEPS b/DEPS index 926e8b1dd6b0e01797a078a9a674e89f9cdc8c52..14229e22a6dcce5d4a7d490ff233eab5f05cf532 100644 --- a/DEPS +++ b/DEPS @@ -26,7 +26,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': 'f3f50099533d66974e12bd04292befbc515af821', + 'skia_revision': 'e30a485a68c9762b0679ad39851d455a0f7abc74', # 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 fe0e0f634aa556a302fea3450cf4ed80b184dc8f..9543bee0f6d85f4c29ffa06f1b9f5048559945ed 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 2f28c83d98ca3ed9d77f137ddb707d02 +Signature: 6c211470af466caa2c028b5294651a86 UNUSED LICENSES: @@ -1936,7 +1936,6 @@ FILE: ../../../third_party/skia/include/core/SkImageFilter.h FILE: ../../../third_party/skia/include/core/SkMatrix44.h FILE: ../../../third_party/skia/include/core/SkSize.h FILE: ../../../third_party/skia/include/effects/SkLayerDrawLooper.h -FILE: ../../../third_party/skia/include/gpu/GrRenderTarget.h FILE: ../../../third_party/skia/include/gpu/GrTexture.h FILE: ../../../third_party/skia/include/gpu/gl/GrGLConfig.h FILE: ../../../third_party/skia/include/gpu/gl/GrGLConfig_chrome.h @@ -2039,6 +2038,7 @@ FILE: ../../../third_party/skia/src/gpu/GrPathRenderer.h FILE: ../../../third_party/skia/src/gpu/GrPathRendererChain.cpp FILE: ../../../third_party/skia/src/gpu/GrPathRendererChain.h FILE: ../../../third_party/skia/src/gpu/GrRenderTarget.cpp +FILE: ../../../third_party/skia/src/gpu/GrRenderTarget.h FILE: ../../../third_party/skia/src/gpu/GrStencilAttachment.cpp FILE: ../../../third_party/skia/src/gpu/GrStencilAttachment.h FILE: ../../../third_party/skia/src/gpu/GrStencilSettings.cpp @@ -2707,7 +2707,6 @@ FILE: ../../../third_party/skia/include/core/SkTraceMemoryDump.h FILE: ../../../third_party/skia/include/effects/SkImageSource.h FILE: ../../../third_party/skia/include/effects/SkTableColorFilter.h FILE: ../../../third_party/skia/include/gpu/GrContextOptions.h -FILE: ../../../third_party/skia/include/gpu/GrSamplerState.h FILE: ../../../third_party/skia/include/gpu/gl/GrGLTypes.h FILE: ../../../third_party/skia/include/ports/SkFontMgr_android.h FILE: ../../../third_party/skia/include/ports/SkFontMgr_directory.h @@ -2841,6 +2840,7 @@ FILE: ../../../third_party/skia/src/gpu/GrRenderTargetContext.h FILE: ../../../third_party/skia/src/gpu/GrRenderTargetPriv.h FILE: ../../../third_party/skia/src/gpu/GrResourceProvider.cpp FILE: ../../../third_party/skia/src/gpu/GrResourceProvider.h +FILE: ../../../third_party/skia/src/gpu/GrSamplerState.h FILE: ../../../third_party/skia/src/gpu/GrTessellator.cpp FILE: ../../../third_party/skia/src/gpu/GrTessellator.h FILE: ../../../third_party/skia/src/gpu/GrTestUtils.cpp