Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/dom/DOMURL.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2012 Motorola Mobility Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef SKY_ENGINE_CORE_DOM_DOMURL_H_
 #define SKY_ENGINE_CORE_DOM_DOMURL_H_
 
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/core/dom/DOMURLUtils.h"
 #include "sky/engine/platform/heap/Handle.h"
 #include "sky/engine/platform/weborigin/KURL.h"
 #include "sky/engine/wtf/Forward.h"
 
 namespace blink {
 
 class Blob;
 class ExceptionState;
 class ExecutionContext;
 class URLRegistrable;
 
-class DOMURL final : public RefCounted<DOMURL>, public ScriptWrappable, public DOMURLUtils {
+class DOMURL final : public RefCounted<DOMURL>, public DartWrappable, public DOMURLUtils {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassRefPtr<DOMURL> create(const String& url, ExceptionState& exceptionState)
     {
         return adoptRef(new DOMURL(url, blankURL(), exceptionState));
     }
     static PassRefPtr<DOMURL> create(const String& url, const String& base, ExceptionState& exceptionState)
     {
         return adoptRef(new DOMURL(url, KURL(KURL(), base), exceptionState));
     }
@@ skipping 12 matching lines @@
 private:
     DOMURL(const String& url, const KURL& base, ExceptionState&);
 
     KURL m_url;
     String m_input;
 };
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_DOM_DOMURL_H_