Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/html/ImageData.h

Index: sky/engine/core/html/ImageData.h
diff --git a/sky/engine/core/html/ImageData.h b/sky/engine/core/html/ImageData.h
index 4e9925ea02dc2407a05341b9ce09039ffffac8f2..fc8dee92d4207320b20862083ed10dae7e9e440d 100644
--- a/sky/engine/core/html/ImageData.h
+++ b/sky/engine/core/html/ImageData.h
@@ -29,7 +29,7 @@
 #ifndef SKY_ENGINE_CORE_HTML_IMAGEDATA_H_
 #define SKY_ENGINE_CORE_HTML_IMAGEDATA_H_
 
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/platform/geometry/IntSize.h"
 #include "sky/engine/platform/heap/Handle.h"
 #include "sky/engine/wtf/RefCounted.h"
@@ -40,7 +40,7 @@ namespace blink {
 
 class ExceptionState;
 
-class ImageData final : public RefCounted<ImageData>, public ScriptWrappable {
+class ImageData final : public RefCounted<ImageData>, public DartWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassRefPtr<ImageData> create(const IntSize&);
@@ -53,8 +53,6 @@ public:
     int height() const { return m_size.height(); }
     Uint8ClampedArray* data() const { return m_data.get(); }
 
-    virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) override;
-
 private:
     explicit ImageData(const IntSize&);
     ImageData(const IntSize&, PassRefPtr<Uint8ClampedArray>);