Roll Skia revision to 342977c (flutter#3523)

* Roll Skia revision to 342977c * Updated license files
jnuhwb · Mar 28, 2017 · 5ee2ba9 · 5ee2ba9
1 parent 2ffab03
commit 5ee2ba9
Show file tree

Hide file tree

Showing 4 changed files with 5,844 additions and 7,950 deletions.
diff --git 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': '3f81f3703a68755c88f5cc4a87728b98f34c4cd4',
+  'skia_revision': '342977ced701d06df2b3d2eedd8b64aeae1eb5c5',
 
   # Note: When updating the Dart revision, ensure that all entries that are
   # dependencies of dart are also updated

diff --git a/lib/ui/painting/vertices.cc b/lib/ui/painting/vertices.cc
@@ -70,22 +70,14 @@ void Vertices::init(SkCanvas::VertexMode vertex_mode,
   std::unique_ptr<const SkColor[]> sk_colors(DecodeInts<SkColor>(colors));
   std::unique_ptr<const uint16_t[]> sk_indices(DecodeInts<uint16_t>(indices));
 
-  if (sk_indices) {
-    vertices_ = SkVertices::MakeIndexed(vertex_mode,
-                                        std::move(sk_positions),
-                                        std::move(sk_colors),
-                                        std::move(sk_texs),
-                                        positions.num_elements() / 2,
-                                        std::move(sk_indices),
-                                        indices.num_elements());
-
-  } else {
-    vertices_ = SkVertices::Make(vertex_mode,
-                                 std::move(sk_positions),
-                                 std::move(sk_colors),
-                                 std::move(sk_texs),
-                                 positions.num_elements() / 2);
-  }
+  // TODO(fmalita): refactor to use SkVertices::Builder and avoid a copy.
+  vertices_ = SkVertices::MakeCopy(vertex_mode,
+                                   positions.num_elements() / 2,
+                                   sk_positions.get(),
+                                   sk_texs.get(),
+                                   sk_colors.get(),
+                                   indices.num_elements(),
+                                   sk_indices.get());
 }
 
 }  // namespace blink