From e09b1a579c4f289904632da0fa4d8564c48a0060 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Thu, 6 Apr 2017 11:49:36 -0700 Subject: [PATCH] Roll Skia to 45a00cee88c0ea8ea175694cb94b26748713fe36 and update licenses. (flutter/engine#3569) --- DEPS | 2 +- engine/src/flutter/lib/ui/painting/vertices.cc | 2 +- engine/src/flutter/lib/ui/painting/vertices.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 38f45512da1..daffe190f5d 100644 --- a/DEPS +++ b/DEPS @@ -22,7 +22,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'github_git': 'https://github.com', - 'skia_revision': '291932e8e42e0556bfef9118231b4ac364ecf5df', + 'skia_revision': '45a00cee88c0ea8ea175694cb94b26748713fe36', # Note: When updating the Dart revision, ensure that all entries that are # dependencies of dart are also updated diff --git a/engine/src/flutter/lib/ui/painting/vertices.cc b/engine/src/flutter/lib/ui/painting/vertices.cc index 8e305703567..6426c174e3f 100644 --- a/engine/src/flutter/lib/ui/painting/vertices.cc +++ b/engine/src/flutter/lib/ui/painting/vertices.cc @@ -49,7 +49,7 @@ ftl::RefPtr Vertices::Create() { return ftl::MakeRefCounted(); } -void Vertices::init(SkCanvas::VertexMode vertex_mode, +void Vertices::init(SkVertices::VertexMode vertex_mode, const tonic::Float32List& positions, const tonic::Float32List& texture_coordinates, const tonic::Int32List& colors, diff --git a/engine/src/flutter/lib/ui/painting/vertices.h b/engine/src/flutter/lib/ui/painting/vertices.h index 4dcef215502..20874a6648e 100644 --- a/engine/src/flutter/lib/ui/painting/vertices.h +++ b/engine/src/flutter/lib/ui/painting/vertices.h @@ -8,7 +8,6 @@ #include "lib/tonic/dart_wrappable.h" #include "lib/tonic/typed_data/float32_list.h" #include "lib/tonic/typed_data/int32_list.h" -#include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkVertices.h" namespace tonic { @@ -30,7 +29,7 @@ class Vertices : public ftl::RefCountedThreadSafe, static ftl::RefPtr Create(); void init( - SkCanvas::VertexMode vertex_mode, + SkVertices::VertexMode vertex_mode, const tonic::Float32List& positions, const tonic::Float32List& texture_coordinates, const tonic::Int32List& colors,