Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/html/canvas/CanvasRenderingContext2D.h

Index: sky/engine/core/html/canvas/CanvasRenderingContext2D.h
diff --git a/sky/engine/core/html/canvas/CanvasRenderingContext2D.h b/sky/engine/core/html/canvas/CanvasRenderingContext2D.h
index 4c86138986aba66a2a39f21c5fbc11c35f32a22c..2c98768395e9d65e54ec1ecc4e2811f48c4be336 100644
--- a/sky/engine/core/html/canvas/CanvasRenderingContext2D.h
+++ b/sky/engine/core/html/canvas/CanvasRenderingContext2D.h
@@ -26,7 +26,7 @@
 #ifndef SKY_ENGINE_CORE_HTML_CANVAS_CANVASRENDERINGCONTEXT2D_H_
 #define SKY_ENGINE_CORE_HTML_CANVAS_CANVASRENDERINGCONTEXT2D_H_
 
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/core/css/CSSFontSelectorClient.h"
 #include "sky/engine/core/html/canvas/Canvas2DContextAttributes.h"
 #include "sky/engine/core/html/canvas/CanvasPathMethods.h"
@@ -64,7 +64,7 @@ class TextMetrics;
 
 typedef HashMap<String, RefPtr<MutableStylePropertySet> > MutableStylePropertyMap;
 
-class CanvasRenderingContext2D final: public CanvasRenderingContext, public ScriptWrappable, public CanvasPathMethods {
+class CanvasRenderingContext2D final: public CanvasRenderingContext, public DartWrappable, public CanvasPathMethods {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassOwnPtr<CanvasRenderingContext2D> create(HTMLCanvasElement* canvas, const Canvas2DContextAttributes* attrs)
@@ -121,6 +121,7 @@ public:
     void setTransform(float m11, float m12, float m21, float m22, float dx, float dy);
     void resetTransform();
 
+    String strokeColor();
     void setStrokeColor(const String& color);
     void setStrokeColor(float grayLevel);
     void setStrokeColor(const String& color, float alpha);
@@ -128,6 +129,7 @@ public:
     void setStrokeColor(float r, float g, float b, float a);
     void setStrokeColor(float c, float m, float y, float k, float a);
 
+    String fillColor();
     void setFillColor(const String& color);
     void setFillColor(float grayLevel);
     void setFillColor(const String& color, float alpha);
@@ -214,7 +216,6 @@ public:
     void drawFocusIfNeeded(Path2D*, Element*);
 
     void addHitRegion(ExceptionState&);
-    void addHitRegion(const Dictionary&, ExceptionState&);
     void removeHitRegion(const String& id);
     void clearHitRegions();
     HitRegion* hitRegionAtPoint(const LayoutPoint&);