Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/html/TextMetrics.h

Index: sky/engine/core/html/TextMetrics.h
diff --git a/sky/engine/core/html/TextMetrics.h b/sky/engine/core/html/TextMetrics.h
index 51d727a7130b56ec3352e13ecd48b0ec5c9348c9..e1d17eb3fd024a9458da21881b139776dffa0d1d 100644
--- a/sky/engine/core/html/TextMetrics.h
+++ b/sky/engine/core/html/TextMetrics.h
@@ -26,14 +26,14 @@
 #ifndef SKY_ENGINE_CORE_HTML_TEXTMETRICS_H_
 #define SKY_ENGINE_CORE_HTML_TEXTMETRICS_H_
 
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/platform/heap/Handle.h"
 #include "sky/engine/wtf/PassRefPtr.h"
 #include "sky/engine/wtf/RefCounted.h"
 
 namespace blink {
 
-class TextMetrics final : public RefCounted<TextMetrics>, public ScriptWrappable {
+class TextMetrics final : public RefCounted<TextMetrics>, public DartWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassRefPtr<TextMetrics> create() { return adoptRef(new TextMetrics); }