Remove integration between tonic and WTF::Vector

There's no reason to use WTF::Vector here over std::vector.

sky/engine/bindings/jni/dart_jni.cc

@@ -242,7 +242,7 @@ Dart_Handle DartJni::jni_float_type() {
 }
 
 void JniMethodArgs::Convert(JNIEnv* env,
-                            const Vector<Dart_Handle>& dart_args,
+                            const std::vector<Dart_Handle>& dart_args,
                             Dart_Handle* exception) {
   jvalues_.reserve(dart_args.size());
 

sky/engine/bindings/jni/dart_jni.h

@@ -42,7 +42,7 @@ class DartJni {
 class JniMethodArgs {
  public:
   void Convert(JNIEnv* env,
-               const Vector<Dart_Handle>& dart_args,
+               const std::vector<Dart_Handle>& dart_args,
                Dart_Handle* exception);
   jvalue* jvalues() { return jvalues_.data(); }
 

sky/engine/bindings/jni/jni_class.cc

@@ -119,8 +119,8 @@ fail:
   return 0;
 }
 
-PassRefPtr<JniObject> JniClass::NewObject(jmethodID methodId,
-                                          const Vector<Dart_Handle>& args) {
+PassRefPtr<JniObject> JniClass::NewObject(
+    jmethodID methodId, const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -430,7 +430,7 @@ fail:
 }
 
 PassRefPtr<JniObject> JniClass::CallStaticObjectMethod(
-    jmethodID methodId, const Vector<Dart_Handle>& args) {
+    jmethodID methodId, const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -452,7 +452,7 @@ fail:
 }
 
 bool JniClass::CallStaticBooleanMethod(jmethodID methodId,
-                                       const Vector<Dart_Handle>& args) {
+                                       const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -474,7 +474,7 @@ fail:
 }
 
 int64_t JniClass::CallStaticByteMethod(jmethodID methodId,
-                                       const Vector<Dart_Handle>& args) {
+                                       const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -496,7 +496,7 @@ fail:
 }
 
 int64_t JniClass::CallStaticCharMethod(jmethodID methodId,
-                                       const Vector<Dart_Handle>& args) {
+                                       const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -518,7 +518,7 @@ fail:
 }
 
 int64_t JniClass::CallStaticShortMethod(jmethodID methodId,
-                                        const Vector<Dart_Handle>& args) {
+                                        const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -540,7 +540,7 @@ fail:
 }
 
 int64_t JniClass::CallStaticIntMethod(jmethodID methodId,
-                                      const Vector<Dart_Handle>& args) {
+                                      const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -562,7 +562,7 @@ fail:
 }
 
 int64_t JniClass::CallStaticLongMethod(jmethodID methodId,
-                                       const Vector<Dart_Handle>& args) {
+                                       const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -584,7 +584,7 @@ fail:
 }
 
 double JniClass::CallStaticFloatMethod(jmethodID methodId,
-                                       const Vector<Dart_Handle>& args) {
+                                       const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -606,7 +606,7 @@ fail:
 }
 
 double JniClass::CallStaticDoubleMethod(jmethodID methodId,
-                                        const Vector<Dart_Handle>& args) {
+                                        const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -628,7 +628,7 @@ fail:
 }
 
 void JniClass::CallStaticVoidMethod(jmethodID methodId,
-                                    const Vector<Dart_Handle>& args) {
+                                    const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();

sky/engine/bindings/jni/jni_class.h

@@ -10,6 +10,7 @@
 #include "base/android/jni_android.h"
 #include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/wtf/PassRefPtr.h"
+#include "sky/engine/wtf/RefCounted.h"
 
 namespace blink {
 
@@ -31,7 +32,7 @@ class JniClass : public RefCounted<JniClass>, public DartWrappable {
   intptr_t GetStaticMethodId(const char* name, const char* sig);
 
   PassRefPtr<JniObject> NewObject(jmethodID methodId,
-                                  const Vector<Dart_Handle>& args);
+                                  const std::vector<Dart_Handle>& args);
 
   PassRefPtr<JniObject> GetStaticObjectField(jfieldID fieldId);
   bool GetStaticBooleanField(jfieldID fieldId);
@@ -53,26 +54,26 @@ class JniClass : public RefCounted<JniClass>, public DartWrappable {
   void SetStaticFloatField(jfieldID fieldId, double value);
   void SetStaticDoubleField(jfieldID fieldId, double value);
 
-  PassRefPtr<JniObject> CallStaticObjectMethod(jmethodID methodId,
-                                               const Vector<Dart_Handle>& args);
+  PassRefPtr<JniObject> CallStaticObjectMethod(
+      jmethodID methodId, const std::vector<Dart_Handle>& args);
   bool CallStaticBooleanMethod(jmethodID methodId,
-                               const Vector<Dart_Handle>& args);
+                               const std::vector<Dart_Handle>& args);
   int64_t CallStaticByteMethod(jmethodID methodId,
-                               const Vector<Dart_Handle>& args);
+                               const std::vector<Dart_Handle>& args);
   int64_t CallStaticCharMethod(jmethodID methodId,
-                               const Vector<Dart_Handle>& args);
+                               const std::vector<Dart_Handle>& args);
   int64_t CallStaticShortMethod(jmethodID methodId,
-                                const Vector<Dart_Handle>& args);
+                                const std::vector<Dart_Handle>& args);
   int64_t CallStaticIntMethod(jmethodID methodId,
-                              const Vector<Dart_Handle>& args);
+                              const std::vector<Dart_Handle>& args);
   int64_t CallStaticLongMethod(jmethodID methodId,
-                               const Vector<Dart_Handle>& args);
+                               const std::vector<Dart_Handle>& args);
   double CallStaticFloatMethod(jmethodID methodId,
-                               const Vector<Dart_Handle>& args);
+                               const std::vector<Dart_Handle>& args);
   double CallStaticDoubleMethod(jmethodID methodId,
-                                const Vector<Dart_Handle>& args);
+                                const std::vector<Dart_Handle>& args);
   void CallStaticVoidMethod(jmethodID methodId,
-                            const Vector<Dart_Handle>& args);
+                            const std::vector<Dart_Handle>& args);
 
  private:
   JniClass(JNIEnv* env, jclass clazz);

sky/engine/bindings/jni/jni_object.cc

@@ -56,7 +56,7 @@ fail:
 
 PassRefPtr<JniObject> JniObject::CallObjectMethod(
     jmethodID methodId,
-    const Vector<Dart_Handle>& args) {
+    const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -78,7 +78,7 @@ fail:
 }
 
 bool JniObject::CallBooleanMethod(jmethodID methodId,
-                                  const Vector<Dart_Handle>& args) {
+                                  const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -100,7 +100,7 @@ fail:
 }
 
 int64_t JniObject::CallIntMethod(jmethodID methodId,
-                              const Vector<Dart_Handle>& args) {
+                                 const std::vector<Dart_Handle>& args) {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -133,7 +133,7 @@ jstring JniString::java_string() {
   return static_cast<jstring>(java_object());
 }
 
-String JniString::GetText() {
+std::string JniString::GetText() {
   Dart_Handle exception = nullptr;
   {
     ENTER_JNI();
@@ -144,7 +144,7 @@ String JniString::GetText() {
     const jchar* chars = env->GetStringChars(java_string(), NULL);
     if (CheckJniException(env, &exception)) goto fail;
 
-    String result(chars, length);
+    std::string result(reinterpret_cast<const char*>(chars), length);
     env->ReleaseStringChars(java_string(), chars);
 
     return result;
@@ -152,7 +152,7 @@ String JniString::GetText() {
 fail:
   Dart_ThrowException(exception);
   ASSERT_NOT_REACHED();
-  return String();
+  return std::string();
 }
 
 } // namespace blink

sky/engine/bindings/jni/jni_object.h

@@ -10,6 +10,7 @@
 #include "base/android/jni_android.h"
 #include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/wtf/PassRefPtr.h"
+#include "sky/engine/wtf/RefCounted.h"
 
 namespace blink {
 
@@ -27,11 +28,11 @@ class JniObject : public RefCounted<JniObject>, public DartWrappable {
   int64_t GetIntField(jfieldID fieldId);
 
   PassRefPtr<JniObject> CallObjectMethod(jmethodID methodId,
-                                         const Vector<Dart_Handle>& args);
+                                         const std::vector<Dart_Handle>& args);
   bool CallBooleanMethod(jmethodID methodId,
-                         const Vector<Dart_Handle>& args);
+                         const std::vector<Dart_Handle>& args);
   int64_t CallIntMethod(jmethodID methodId,
-                        const Vector<Dart_Handle>& args);
+                        const std::vector<Dart_Handle>& args);
 
  protected:
   JniObject(JNIEnv* env, jobject object);
@@ -47,7 +48,7 @@ class JniString : public JniObject {
  public:
   ~JniString() override;
 
-  String GetText();
+  std::string GetText();
 
  private:
   JniString(JNIEnv* env, jstring string);

sky/engine/core/painting/Canvas.cpp

@@ -279,35 +279,35 @@ void Canvas::drawPicture(Picture* picture)
 }
 
 void Canvas::drawVertices(SkCanvas::VertexMode vertexMode,
-        const Vector<Point>& vertices,
-        const Vector<Point>& textureCoordinates,
-        const Vector<CanvasColor>& colors,
+        const std::vector<Point>& vertices,
+        const std::vector<Point>& textureCoordinates,
+        const std::vector<CanvasColor>& colors,
         TransferMode transferMode,
-        const Vector<int>& indices,
+        const std::vector<int>& indices,
         const Paint& paint)
 {
   if (!m_canvas)
     return;
 
-  Vector<SkPoint> skVertices;
-  skVertices.reserveInitialCapacity(vertices.size());
+  std::vector<SkPoint> skVertices;
+  skVertices.reserve(vertices.size());
   for (const Point& point : vertices)
-    skVertices.append(point.sk_point);
+    skVertices.push_back(point.sk_point);
 
-  Vector<SkPoint> skTextureCoordinates;
-  skVertices.reserveInitialCapacity(textureCoordinates.size());
+  std::vector<SkPoint> skTextureCoordinates;
+  skVertices.reserve(textureCoordinates.size());
   for (const Point& point : textureCoordinates)
-    skTextureCoordinates.append(point.sk_point);
+    skTextureCoordinates.push_back(point.sk_point);
 
-  Vector<SkColor> skColors;
-  skColors.reserveInitialCapacity(colors.size());
+  std::vector<SkColor> skColors;
+  skColors.reserve(colors.size());
   for (const CanvasColor& color : colors)
-    skColors.append(color);
+    skColors.push_back(color);
 
-  Vector<uint16_t> skIndices;
-  skIndices.reserveInitialCapacity(indices.size());
+  std::vector<uint16_t> skIndices;
+  skIndices.reserve(indices.size());
   for (uint16_t i : indices)
-    skIndices.append(i);
+    skIndices.push_back(i);
 
   RefPtr<SkXfermode> transferModePtr = adoptRef(SkXfermode::Create(transferMode));
 
@@ -315,18 +315,18 @@ void Canvas::drawVertices(SkCanvas::VertexMode vertexMode,
     vertexMode,
     skVertices.size(),
     skVertices.data(),
-    skTextureCoordinates.isEmpty() ? nullptr : skTextureCoordinates.data(),
-    skColors.isEmpty() ? nullptr : skColors.data(),
+    skTextureCoordinates.empty() ? nullptr : skTextureCoordinates.data(),
+    skColors.empty() ? nullptr : skColors.data(),
     transferModePtr.get(),
-    skIndices.isEmpty() ? nullptr : skIndices.data(),
+    skIndices.empty() ? nullptr : skIndices.data(),
     skIndices.size(),
     *paint.paint()
   );
 }
 
 void Canvas::drawAtlas(CanvasImage* atlas,
-    const Vector<RSTransform>& transforms, const Vector<Rect>& rects,
-    const Vector<CanvasColor>& colors, TransferMode mode,
+    const std::vector<RSTransform>& transforms, const std::vector<Rect>& rects,
+    const std::vector<CanvasColor>& colors, TransferMode mode,
     const Rect& cullRect, const Paint& paint)
 {
   if (!m_canvas)
@@ -334,26 +334,26 @@ void Canvas::drawAtlas(CanvasImage* atlas,
 
   RefPtr<SkImage> skImage = atlas->image();
 
-  Vector<SkRSXform> skXForms;
-  skXForms.reserveInitialCapacity(transforms.size());
+  std::vector<SkRSXform> skXForms;
+  skXForms.reserve(transforms.size());
   for (const RSTransform& transform : transforms)
-    skXForms.append(transform.sk_xform);
+    skXForms.push_back(transform.sk_xform);
 
-  Vector<SkRect> skRects;
-  skRects.reserveInitialCapacity(rects.size());
+  std::vector<SkRect> skRects;
+  skRects.reserve(rects.size());
   for (const Rect& rect : rects)
-    skRects.append(rect.sk_rect);
+    skRects.push_back(rect.sk_rect);
 
-  Vector<SkColor> skColors;
-  skColors.reserveInitialCapacity(colors.size());
+  std::vector<SkColor> skColors;
+  skColors.reserve(colors.size());
   for (const CanvasColor& color : colors)
-    skColors.append(color);
+    skColors.push_back(color);
 
   m_canvas->drawAtlas(
       skImage.get(),
       skXForms.data(),
       skRects.data(),
-      skColors.isEmpty() ? nullptr : skColors.data(),
+      skColors.empty() ? nullptr : skColors.data(),
       skXForms.size(),
       mode,
       cullRect.is_null ? nullptr : &cullRect.sk_rect,

sky/engine/core/painting/Canvas.h

@@ -69,16 +69,18 @@ public:
     void drawPicture(Picture* picture);
 
     void drawVertices(SkCanvas::VertexMode vertexMode,
-        const Vector<Point>& vertices,
-        const Vector<Point>& textureCoordinates,
-        const Vector<CanvasColor>& colors,
+        const std::vector<Point>& vertices,
+        const std::vector<Point>& textureCoordinates,
+        const std::vector<CanvasColor>& colors,
         TransferMode transferMode,
-        const Vector<int>& indices,
+        const std::vector<int>& indices,
         const Paint& paint);
 
     void drawAtlas(CanvasImage* atlas,
-        const Vector<RSTransform>& transforms, const Vector<Rect>& rects,
-        const Vector<CanvasColor>& colors, TransferMode mode,
+        const std::vector<RSTransform>& transforms,
+        const std::vector<Rect>& rects,
+        const std::vector<CanvasColor>& colors,
+        TransferMode mode,
         const Rect& cullRect, const Paint& paint);
 
     SkCanvas* skCanvas() { return m_canvas; }

sky/engine/core/painting/CanvasGradient.cpp

@@ -36,9 +36,9 @@ PassRefPtr<CanvasGradient> CanvasGradient::create() {
   return adoptRef(new CanvasGradient());
 }
 
-void CanvasGradient::initLinear(const Vector<Point>& end_points,
-                                const Vector<CanvasColor>& colors,
-                                const Vector<float>& color_stops,
+void CanvasGradient::initLinear(const std::vector<Point>& end_points,
+                                const std::vector<CanvasColor>& colors,
+                                const std::vector<float>& color_stops,
                                 SkShader::TileMode tile_mode) {
   ASSERT(end_points.size() == 2);
   ASSERT(colors.size() == color_stops.size() || color_stops.data() == nullptr);
@@ -46,10 +46,10 @@ void CanvasGradient::initLinear(const Vector<Point>& end_points,
   for (int i = 0; i < 2; ++i)
     sk_end_points[i] = end_points[i].sk_point;
 
-  Vector<SkColor> sk_colors;
-  sk_colors.reserveInitialCapacity(colors.size());
+  std::vector<SkColor> sk_colors;
+  sk_colors.reserve(colors.size());
   for (const CanvasColor& color : colors)
-    sk_colors.append(color);
+    sk_colors.push_back(color);
 
   SkShader* shader = SkGradientShader::CreateLinear(
       sk_end_points, sk_colors.data(), color_stops.data(), sk_colors.size(),
@@ -59,15 +59,15 @@ void CanvasGradient::initLinear(const Vector<Point>& end_points,
 
 void CanvasGradient::initRadial(const Point& center,
                                 double radius,
-                                const Vector<CanvasColor>& colors,
-                                const Vector<float>& color_stops,
+                                const std::vector<CanvasColor>& colors,
+                                const std::vector<float>& color_stops,
                                 SkShader::TileMode tile_mode) {
   ASSERT(colors.size() == color_stops.size() || color_stops.data() == nullptr);
 
-  Vector<SkColor> sk_colors;
-  sk_colors.reserveInitialCapacity(colors.size());
+  std::vector<SkColor> sk_colors;
+  sk_colors.reserve(colors.size());
   for (const CanvasColor& color : colors)
-    sk_colors.append(color);
+    sk_colors.push_back(color);
 
   SkShader* shader = SkGradientShader::CreateRadial(
       center.sk_point, radius, sk_colors.data(), color_stops.data(),

sky/engine/core/painting/CanvasGradient.h

@@ -25,15 +25,15 @@ class CanvasGradient : public Shader {
   ~CanvasGradient() override;
   static PassRefPtr<CanvasGradient> create();
 
-  void initLinear(const Vector<Point>& end_points,
-                  const Vector<CanvasColor>& colors,
-                  const Vector<float>& color_stops,
+  void initLinear(const std::vector<Point>& end_points,
+                  const std::vector<CanvasColor>& colors,
+                  const std::vector<float>& color_stops,
                   SkShader::TileMode tile_mode);
 
   void initRadial(const Point& center,
                   double radius,
-                  const Vector<CanvasColor>& colors,
-                  const Vector<float>& color_stops,
+                  const std::vector<CanvasColor>& colors,
+                  const std::vector<float>& color_stops,
                   SkShader::TileMode tile_mode);
 
   static void RegisterNatives(DartLibraryNatives* natives);

sky/engine/tonic/dart_converter.h

@@ -6,8 +6,8 @@
 #define SKY_ENGINE_TONIC_DART_CONVERTER_H_
 
 #include <string>
+#include <vector>
 #include "sky/engine/tonic/dart_state.h"
-#include "sky/engine/wtf/Vector.h"
 
 namespace blink {
 
@@ -239,11 +239,11 @@ struct DartConverter<const char*> {
 // Collections
 
 template <typename T>
-struct DartConverter<Vector<T>> {
+struct DartConverter<std::vector<T>> {
   using ValueType = typename DartConverterTypes<T>::ValueType;
   using ConverterType = typename DartConverterTypes<T>::ConverterType;
 
-  static Dart_Handle ToDart(const Vector<ValueType>& val) {
+  static Dart_Handle ToDart(const std::vector<ValueType>& val) {
     Dart_Handle list = Dart_NewList(val.size());
     if (Dart_IsError(list))
       return list;
@@ -257,35 +257,35 @@ struct DartConverter<Vector<T>> {
     return list;
   }
 
-  static Vector<ValueType> FromDart(Dart_Handle handle) {
-    Vector<ValueType> result;
+  static std::vector<ValueType> FromDart(Dart_Handle handle) {
+    std::vector<ValueType> result;
+
     if (!Dart_IsList(handle))
       return result;
+
     intptr_t length = 0;
     Dart_ListLength(handle, &length);
 
-    if (length == 0) {
+    if (length == 0)
       return result;
-    }
 
-    result.reserveCapacity(length);
+    result.reserve(length);
 
-    Vector<Dart_Handle> items(length);
+    std::vector<Dart_Handle> items(length);
     Dart_Handle items_result = Dart_ListGetRange(handle, 0, length,
                                                  items.data());
     DCHECK(!Dart_IsError(items_result));
 
     for (intptr_t i = 0; i < length; ++i) {
       DCHECK(items[i]);
-      result.append(DartConverter<ConverterType>::FromDart(items[i]));
+      result.push_back(DartConverter<ConverterType>::FromDart(items[i]));
     }
     return result;
   }
 
-  static Vector<ValueType> FromArguments(Dart_NativeArguments args,
+  static std::vector<ValueType> FromArguments(Dart_NativeArguments args,
                                           int index,
                                           Dart_Handle& exception) {
-    // TODO(abarth): What should we do with auto_scope?
     return FromDart(Dart_GetNativeArgument(args, index));
   }
 };
@@ -316,12 +316,7 @@ struct DartConverter<Dart_Handle> {
 };
 
 ////////////////////////////////////////////////////////////////////////////////
-// Convience wrappers using type inference for ease of code generation
-
-template <typename T>
-inline Dart_Handle VectorToDart(const Vector<T>& val) {
-  return DartConverter<Vector<T>>::ToDart(val);
-}
+// Convience wrappers using type inference
 
 template<typename T>
 Dart_Handle ToDart(const T& object) {

sky/engine/tonic/dart_wrappable.h

@@ -12,6 +12,8 @@
 #include "sky/engine/tonic/dart_error.h"
 #include "sky/engine/tonic/dart_state.h"
 #include "sky/engine/tonic/dart_wrapper_info.h"
+#include "sky/engine/wtf/PassRefPtr.h"
+#include "sky/engine/wtf/RefPtr.h"
 
 namespace blink {
 class DartGCVisitor;

sky/engine/tonic/float32_list.cc

@@ -19,7 +19,7 @@ Float32List::Float32List(Dart_Handle list)
   Dart_TypedDataAcquireData(
       list, &type, reinterpret_cast<void**>(&data_), &num_elements_);
   DCHECK(!LogIfError(list));
-  ASSERT(type == Dart_TypedData_kFloat32);
+  DCHECK(type == Dart_TypedData_kFloat32);
 }
 
 Float32List::Float32List(Float32List&& other)

sky/engine/tonic/float64_list.cc

@@ -19,7 +19,7 @@ Float64List::Float64List(Dart_Handle list)
   Dart_TypedDataAcquireData(
       list, &type, reinterpret_cast<void**>(&data_), &num_elements_);
   DCHECK(!LogIfError(list));
-  ASSERT(type == Dart_TypedData_kFloat64);
+  DCHECK(type == Dart_TypedData_kFloat64);
 }
 
 Float64List::Float64List(Float64List&& other)

sky/engine/tonic/int32_list.cc

@@ -19,7 +19,7 @@ Int32List::Int32List(Dart_Handle list)
   Dart_TypedDataAcquireData(
       list, &type, reinterpret_cast<void**>(&data_), &num_elements_);
   DCHECK(!LogIfError(list));
-  ASSERT(type == Dart_TypedData_kInt32);
+  DCHECK(type == Dart_TypedData_kInt32);
 }
 
 Int32List::Int32List(Int32List&& other)

sky/engine/tonic/uint8_list.cc

@@ -19,7 +19,7 @@ Uint8List::Uint8List(Dart_Handle list)
   Dart_TypedDataAcquireData(
       list, &type, reinterpret_cast<void**>(&data_), &num_elements_);
   DCHECK(!LogIfError(list));
-  ASSERT(type == Dart_TypedData_kUint8);
+  DCHECK(type == Dart_TypedData_kUint8);
 }
 
 Uint8List::Uint8List(Uint8List&& other)