Merge the Sky Engine changes from the SkyDart branch

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

Index: sky/engine/core/html/canvas/WebGLCompressedTextureS3TC.h
diff --git a/sky/engine/core/html/canvas/WebGLCompressedTextureS3TC.h b/sky/engine/core/html/canvas/WebGLCompressedTextureS3TC.h
index 72d09b9603f7bf8f11513445f886da90faeea387..a216355f6f273ee4bc35c35b49cda6dc0df42431 100644
--- a/sky/engine/core/html/canvas/WebGLCompressedTextureS3TC.h
+++ b/sky/engine/core/html/canvas/WebGLCompressedTextureS3TC.h
@@ -26,7 +26,7 @@
 #ifndef SKY_ENGINE_CORE_HTML_CANVAS_WEBGLCOMPRESSEDTEXTURES3TC_H_
 #define SKY_ENGINE_CORE_HTML_CANVAS_WEBGLCOMPRESSEDTEXTURES3TC_H_
 
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/core/html/canvas/WebGLExtension.h"
 #include "sky/engine/wtf/PassRefPtr.h"
 
@@ -34,7 +34,7 @@ namespace blink {
 
 class WebGLTexture;
 
-class WebGLCompressedTextureS3TC final : public WebGLExtension, public ScriptWrappable {
+class WebGLCompressedTextureS3TC final : public WebGLExtension, public DartWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassRefPtr<WebGLCompressedTextureS3TC> create(WebGLRenderingContextBase*);