Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/frame/Screen.h

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * 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
@@ skipping 12 matching lines @@
  * 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_FRAME_SCREEN_H_
 #define SKY_ENGINE_CORE_FRAME_SCREEN_H_
 
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/core/frame/DOMWindowProperty.h"
 #include "sky/engine/platform/Supplementable.h"
 #include "sky/engine/platform/heap/Handle.h"
 #include "sky/engine/wtf/PassRefPtr.h"
 #include "sky/engine/wtf/RefCounted.h"
 
 namespace blink {
 
 class LocalFrame;
 
-class Screen final : public RefCounted<Screen>, public ScriptWrappable, public DOMWindowProperty, public Supplementable<Screen> {
+class Screen final : public RefCounted<Screen>, public DartWrappable, public DOMWindowProperty, public Supplementable<Screen> {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassRefPtr<Screen> create(LocalFrame* frame)
     {
         return adoptRef(new Screen(frame));
     }
 
     unsigned height() const;
     unsigned width() const;
     unsigned colorDepth() const;
     unsigned pixelDepth() const;
     int availLeft() const;
     int availTop() const;
     unsigned availHeight() const;
     unsigned availWidth() const;
 
 private:
     explicit Screen(LocalFrame*);
 };
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_FRAME_SCREEN_H_