Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 13 matching lines @@
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "sky/engine/config.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 
 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
-#include "sky/engine/bindings/core/v8/ScriptController.h"
 #include "sky/engine/core/editing/Editor.h"
 #include "sky/engine/core/editing/FrameSelection.h"
+#include "sky/engine/core/editing/htmlediting.h"
 #include "sky/engine/core/editing/InputMethodController.h"
 #include "sky/engine/core/editing/SpellChecker.h"
-#include "sky/engine/core/editing/htmlediting.h"
 #include "sky/engine/core/events/Event.h"
 #include "sky/engine/core/fetch/ResourceFetcher.h"
 #include "sky/engine/core/frame/FrameConsole.h"
 #include "sky/engine/core/frame/FrameDestructionObserver.h"
 #include "sky/engine/core/frame/FrameHost.h"
 #include "sky/engine/core/frame/FrameView.h"
 #include "sky/engine/core/frame/LocalDOMWindow.h"
 #include "sky/engine/core/frame/NewEventHandler.h"
 #include "sky/engine/core/frame/Settings.h"
-#include "sky/engine/core/inspector/ConsoleMessageStorage.h"
 #include "sky/engine/core/loader/FrameLoaderClient.h"
 #include "sky/engine/core/loader/MojoLoader.h"
 #include "sky/engine/core/page/EventHandler.h"
 #include "sky/engine/core/page/FocusController.h"
 #include "sky/engine/core/page/Page.h"
 #include "sky/engine/core/rendering/HitTestResult.h"
 #include "sky/engine/core/rendering/RenderLayer.h"
 #include "sky/engine/core/rendering/RenderView.h"
+#include "sky/engine/core/script/dart_controller.h"
 #include "sky/engine/platform/graphics/GraphicsContext.h"
 #include "sky/engine/platform/graphics/ImageBuffer.h"
 #include "sky/engine/platform/text/TextStream.h"
 #include "sky/engine/wtf/PassOwnPtr.h"
 #include "sky/engine/wtf/StdLibExtras.h"
 
 namespace blink {
 
 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host)
     : Frame(client, host)
     , m_deprecatedLoader(this)
     , m_mojoLoader(adoptPtr(new MojoLoader(*this)))
-    , m_script(adoptPtr(new ScriptController(this)))
+    , m_dart(adoptPtr(new DartController()))
     , m_editor(Editor::create(*this))
     , m_spellChecker(SpellChecker::create(*this))
     , m_selection(FrameSelection::create(this))
     , m_eventHandler(adoptPtr(new EventHandler(this)))
     , m_newEventHandler(adoptPtr(new NewEventHandler(*this)))
     , m_console(FrameConsole::create(*this))
     , m_inputMethodController(InputMethodController::create(*this))
 {
     page()->setMainFrame(this);
 }
@@ skipping 37 matching lines @@
     // will trigger the unload event handlers of any child frames, and those event
     // handlers might start a new subresource load in this frame.
     m_deprecatedLoader.stopAllLoaders();
 
     setView(nullptr);
     willDetachFrameHost();
 
     // Finish all cleanup work that might require talking to the embedder.
     // Notify ScriptController that the frame is closing, since its cleanup ends up calling
     // back to FrameLoaderClient via WindowProxy.
-    script().clearForClose();
+    dart().ClearForClose();
     // After this, we must no longer talk to the client since this clears
     // its owning reference back to our owning LocalFrame.
     loaderClient()->detachedFromParent();
     clearClient();
     detachFromFrameHost();
 }
 
 void LocalFrame::setView(PassRefPtr<FrameView> view)
 {
     // We the custom scroll bars as early as possible to prevent m_doc->detach()
@@ skipping 23 matching lines @@
 
     ASSERT(fabs(originalSize.width()) > std::numeric_limits<float>::epsilon());
     float ratio = originalSize.height() / originalSize.width();
     resultSize.setWidth(floorf(expectedSize.width()));
     resultSize.setHeight(floorf(resultSize.width() * ratio));
     return resultSize;
 }
 
 void LocalFrame::setDOMWindow(PassRefPtr<LocalDOMWindow> domWindow)
 {
-    if (m_domWindow) {
-        console().messageStorage()->frameWindowDiscarded(m_domWindow.get());
-    }
-    if (domWindow)
-        script().clearWindowProxy();
     Frame::setDOMWindow(domWindow);
 }
 
 void LocalFrame::didChangeVisibilityState()
 {
     if (document())
         document()->didChangeVisibilityState();
 }
 
 void LocalFrame::addDestructionObserver(FrameDestructionObserver* observer)
@@ skipping 125 matching lines @@
 }
 
 double LocalFrame::devicePixelRatio() const
 {
     if (!m_host)
         return 0;
     return m_host->deviceScaleFactor();
 }
 
 } // namespace blink