diff --git a/DEPS b/DEPS index acfda36fbe9a8..6b2bf268f2b0e 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': '7c2dc625d01e15a86da4abd32b4d81da04c35753', + 'skia_revision': '02b1d4f51ea082830babf5a4d0dccefc1f8f1773', # 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 d30d22a8337f0..5f3dd7ebfe472 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 38a8f7c4cb130c555b91ac7dcf33c6d7 +Signature: c35c94c69dacfd76e75546bc3cc73c10 UNUSED LICENSES: @@ -5419,8 +5419,8 @@ FILE: ../../../third_party/skia/gm/crbug_1313579.cpp FILE: ../../../third_party/skia/include/core/SkAlphaType.h FILE: ../../../third_party/skia/include/core/SkCapabilities.h FILE: ../../../third_party/skia/include/core/SkColorType.h -FILE: ../../../third_party/skia/include/core/SkCombinationBuilder.h FILE: ../../../third_party/skia/include/gpu/GpuTypes.h +FILE: ../../../third_party/skia/include/gpu/graphite/CombinationBuilder.h FILE: ../../../third_party/skia/include/gpu/graphite/ContextOptions.h FILE: ../../../third_party/skia/include/gpu/graphite/ImageProvider.h FILE: ../../../third_party/skia/include/gpu/vk/VulkanBackendContext.h @@ -5431,10 +5431,7 @@ FILE: ../../../third_party/skia/infra/bots/task_drivers/canvaskit_gold/canvaskit FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp FILE: ../../../third_party/skia/src/core/SkBuiltInCodeSnippetID.h FILE: ../../../third_party/skia/src/core/SkCapabilities.cpp -FILE: ../../../third_party/skia/src/core/SkCombinationBuilder.cpp FILE: ../../../third_party/skia/src/core/SkDebugUtils.h -FILE: ../../../third_party/skia/src/core/SkFactoryFunctions.cpp -FILE: ../../../third_party/skia/src/core/SkFactoryFunctions.h FILE: ../../../third_party/skia/src/core/SkKeyContext.cpp FILE: ../../../third_party/skia/src/core/SkKeyContext.h FILE: ../../../third_party/skia/src/core/SkKeyHelpers.cpp @@ -5443,7 +5440,6 @@ FILE: ../../../third_party/skia/src/core/SkPaintParamsKey.cpp FILE: ../../../third_party/skia/src/core/SkPaintParamsKey.h FILE: ../../../third_party/skia/src/core/SkPipelineData.cpp FILE: ../../../third_party/skia/src/core/SkPipelineData.h -FILE: ../../../third_party/skia/src/core/SkPrecompile.h FILE: ../../../third_party/skia/src/core/SkRuntimeEffectDictionary.h FILE: ../../../third_party/skia/src/core/SkSLTypeShared.cpp FILE: ../../../third_party/skia/src/core/SkSLTypeShared.h @@ -5465,6 +5461,7 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/VertexChunkPatchAlloca FILE: ../../../third_party/skia/src/gpu/graphite/AttachmentTypes.h FILE: ../../../third_party/skia/src/gpu/graphite/ClipStack.cpp FILE: ../../../third_party/skia/src/gpu/graphite/ClipStack_graphite.h +FILE: ../../../third_party/skia/src/gpu/graphite/CombinationBuilder.cpp FILE: ../../../third_party/skia/src/gpu/graphite/CommandTypes.h FILE: ../../../third_party/skia/src/gpu/graphite/ComputePassTask.cpp FILE: ../../../third_party/skia/src/gpu/graphite/ComputePassTask.h @@ -5476,6 +5473,8 @@ FILE: ../../../third_party/skia/src/gpu/graphite/DrawAtlas.cpp FILE: ../../../third_party/skia/src/gpu/graphite/DrawAtlas.h FILE: ../../../third_party/skia/src/gpu/graphite/DrawCommands.h FILE: ../../../third_party/skia/src/gpu/graphite/DrawParams.h +FILE: ../../../third_party/skia/src/gpu/graphite/FactoryFunctions.cpp +FILE: ../../../third_party/skia/src/gpu/graphite/FactoryFunctions.h FILE: ../../../third_party/skia/src/gpu/graphite/GlobalCache.cpp FILE: ../../../third_party/skia/src/gpu/graphite/GlobalCache.h FILE: ../../../third_party/skia/src/gpu/graphite/GpuWorkSubmission.cpp @@ -5488,6 +5487,7 @@ FILE: ../../../third_party/skia/src/gpu/graphite/PaintParams.cpp FILE: ../../../third_party/skia/src/gpu/graphite/PaintParams.h FILE: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.cpp FILE: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.h +FILE: ../../../third_party/skia/src/gpu/graphite/Precompile.h FILE: ../../../third_party/skia/src/gpu/graphite/QueueManager.cpp FILE: ../../../third_party/skia/src/gpu/graphite/QueueManager.h FILE: ../../../third_party/skia/src/gpu/graphite/RecorderPriv.h diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 893175194240c..98e4fd4745525 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -5267,7 +5267,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -dart double-conversion icu