Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/frame/LocalFrame.cpp

Index: sky/engine/core/frame/LocalFrame.cpp
diff --git a/sky/engine/core/frame/LocalFrame.cpp b/sky/engine/core/frame/LocalFrame.cpp
index 528c070cf1f57b144f51ef9f5d91bc30bb5392bb..50e0c9143229e522e0aeec87e7084280002b79ca 100644
--- a/sky/engine/core/frame/LocalFrame.cpp
+++ b/sky/engine/core/frame/LocalFrame.cpp
@@ -31,12 +31,11 @@
 #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"
@@ -46,7 +45,6 @@
 #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"
@@ -55,6 +53,7 @@
 #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"
@@ -67,7 +66,7 @@ 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))
@@ -125,7 +124,7 @@ void LocalFrame::detach()
     // 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();
@@ -169,11 +168,6 @@ FloatSize LocalFrame::resizePageRectsKeepingRatio(const FloatSize& originalSize,
 
 void LocalFrame::setDOMWindow(PassRefPtr<LocalDOMWindow> domWindow)
 {
-    if (m_domWindow) {
-        console().messageStorage()->frameWindowDiscarded(m_domWindow.get());
-    }
-    if (domWindow)
-        script().clearWindowProxy();
     Frame::setDOMWindow(domWindow);
 }