Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/frame/LocalFrame.h

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
@@ skipping 19 matching lines @@
 
 #include "sky/engine/core/frame/Frame.h"
 #include "sky/engine/core/loader/FrameLoader.h"
 #include "sky/engine/platform/Supplementable.h"
 #include "sky/engine/platform/heap/Handle.h"
 #include "sky/engine/wtf/HashSet.h"
 
 namespace blink {
 
     class Color;
+    class DartController;
     class Document;
     class Editor;
     class Element;
     class EventHandler;
     class FetchContext;
     class FloatRect;
     class FloatSize;
     class FrameConsole;
     class FrameDestructionObserver;
     class FrameSelection;
     class FrameView;
     class InputMethodController;
     class IntPoint;
     class IntSize;
     class MojoLoader;
     class NewEventHandler;
     class Node;
     class Range;
     class RenderView;
-    class ScriptController;
     class SpellChecker;
     class TreeScope;
     class TreeScope;
     class VisiblePosition;
 
     class LocalFrame : public Frame, public Supplementable<LocalFrame>  {
     public:
         static PassRefPtr<LocalFrame> create(FrameLoaderClient*, FrameHost*);
 
         void setView(PassRefPtr<FrameView>);
@@ skipping 15 matching lines @@
 
         RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.
 
         Editor& editor() const;
         EventHandler& eventHandler() const;
         NewEventHandler& newEventHandler() const;
         MojoLoader& mojoLoader() const { return *m_mojoLoader; }
         FrameSelection& selection() const;
         InputMethodController& inputMethodController() const;
         FetchContext& fetchContext() const;
-        ScriptController& script();
+        DartController& dart();
         SpellChecker& spellChecker() const;
         FrameConsole& console() const;
 
         void didChangeVisibilityState();
 
         FrameLoaderClient* loaderClient() const;
 
     // ======== All public functions below this point are candidates to move out of LocalFrame into another class. ========
 
         FloatSize resizePageRectsKeepingRatio(const FloatSize& originalSize, const FloatSize& expectedSize);
@@ skipping 13 matching lines @@
 
     private:
         LocalFrame(FrameLoaderClient*, FrameHost*);
 
         HashSet<FrameDestructionObserver*> m_destructionObservers;
         mutable FrameLoader m_deprecatedLoader;
         OwnPtr<MojoLoader> m_mojoLoader;
 
         RefPtr<FrameView> m_view;
 
-        OwnPtr<ScriptController> m_script;
+        OwnPtr<DartController> m_dart;
         const OwnPtr<Editor> m_editor;
         const OwnPtr<SpellChecker> m_spellChecker;
         const OwnPtr<FrameSelection> m_selection;
         const OwnPtr<EventHandler> m_eventHandler;
         const OwnPtr<NewEventHandler> m_newEventHandler;
         const OwnPtr<FrameConsole> m_console;
         OwnPtr<InputMethodController> m_inputMethodController;
     };
 
     inline FrameView* LocalFrame::view() const
     {
         return m_view.get();
     }
 
-    inline ScriptController& LocalFrame::script()
+    inline DartController& LocalFrame::dart()
     {
-        return *m_script;
+        return *m_dart;
     }
 
     inline FrameSelection& LocalFrame::selection() const
     {
         return *m_selection;
     }
 
     inline Editor& LocalFrame::editor() const
     {
         return *m_editor;
@@ skipping 29 matching lines @@
     DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, true, true);
 
 } // namespace blink
 
 // During refactoring, there are some places where we need to do type conversions that
 // will not be needed once all instances of LocalFrame and RemoteFrame are sorted out.
 // At that time this #define will be removed and all the uses of it will need to be corrected.
 #define toLocalFrameTemporary toLocalFrame
 
 #endif  // SKY_ENGINE_CORE_FRAME_LOCALFRAME_H_