Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/frame/ImageBitmap.h

Index: sky/engine/core/frame/ImageBitmap.h
diff --git a/sky/engine/core/frame/ImageBitmap.h b/sky/engine/core/frame/ImageBitmap.h
index cbba55a707908811351b388d36ad7228037d6435..dff744be52cb2f70674ce961415977589c2b4553 100644
--- a/sky/engine/core/frame/ImageBitmap.h
+++ b/sky/engine/core/frame/ImageBitmap.h
@@ -5,7 +5,7 @@
 #ifndef SKY_ENGINE_CORE_FRAME_IMAGEBITMAP_H_
 #define SKY_ENGINE_CORE_FRAME_IMAGEBITMAP_H_
 
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/core/html/HTMLImageElement.h"
 #include "sky/engine/core/html/canvas/CanvasImageSource.h"
 #include "sky/engine/platform/geometry/IntRect.h"
@@ -19,7 +19,7 @@ namespace blink {
 class HTMLCanvasElement;
 class ImageData;
 
-class ImageBitmap final : public RefCounted<ImageBitmap>, public ScriptWrappable, public ImageLoaderClient, public CanvasImageSource {
+class ImageBitmap final : public RefCounted<ImageBitmap>, public DartWrappable, public ImageLoaderClient, public CanvasImageSource {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassRefPtr<ImageBitmap> create(HTMLImageElement*, const IntRect&);