Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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 11 matching lines @@
  * 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.
  */
 
 #include "sky/engine/config.h"
 #include "sky/engine/core/frame/LocalDOMWindow.h"
 
 #include <algorithm>
 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
-#include "sky/engine/bindings/core/v8/Dictionary.h"
-#include "sky/engine/bindings/core/v8/ExceptionMessages.h"
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
-#include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h"
-#include "sky/engine/bindings/core/v8/ScriptCallStackFactory.h"
-#include "sky/engine/bindings/core/v8/ScriptController.h"
-#include "sky/engine/bindings/core/v8/SerializedScriptValue.h"
+#include "sky/engine/bindings2/exception_messages.h"
+#include "sky/engine/bindings2/exception_state.h"
+#include "sky/engine/bindings2/exception_state_placeholder.h"
 #include "sky/engine/core/app/Application.h"
 #include "sky/engine/core/css/CSSComputedStyleDeclaration.h"
 #include "sky/engine/core/css/DOMWindowCSS.h"
 #include "sky/engine/core/css/MediaQueryList.h"
 #include "sky/engine/core/css/MediaQueryMatcher.h"
 #include "sky/engine/core/css/resolver/StyleResolver.h"
 #include "sky/engine/core/dom/Document.h"
 #include "sky/engine/core/dom/Element.h"
 #include "sky/engine/core/dom/ExceptionCode.h"
 #include "sky/engine/core/dom/ExecutionContext.h"
 #include "sky/engine/core/dom/RequestAnimationFrameCallback.h"
 #include "sky/engine/core/editing/Editor.h"
 #include "sky/engine/core/events/DOMWindowEventQueue.h"
 #include "sky/engine/core/events/EventListener.h"
 #include "sky/engine/core/events/HashChangeEvent.h"
 #include "sky/engine/core/events/PageTransitionEvent.h"
-#include "sky/engine/core/frame/Console.h"
 #include "sky/engine/core/frame/DOMWindowLifecycleNotifier.h"
 #include "sky/engine/core/frame/FrameConsole.h"
 #include "sky/engine/core/frame/FrameHost.h"
 #include "sky/engine/core/frame/FrameView.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/frame/Location.h"
 #include "sky/engine/core/frame/Screen.h"
 #include "sky/engine/core/frame/Settings.h"
 #include "sky/engine/core/inspector/ConsoleMessage.h"
-#include "sky/engine/core/inspector/ConsoleMessageStorage.h"
 #include "sky/engine/core/loader/FrameLoaderClient.h"
 #include "sky/engine/core/page/ChromeClient.h"
 #include "sky/engine/core/page/EventHandler.h"
 #include "sky/engine/core/page/Page.h"
 #include "sky/engine/core/rendering/style/RenderStyle.h"
+#include "sky/engine/core/script/dart_controller.h"
 #include "sky/engine/platform/EventDispatchForbiddenScope.h"
 #include "sky/engine/platform/PlatformScreen.h"
 #include "sky/engine/platform/geometry/FloatRect.h"
 #include "sky/engine/platform/weborigin/KURL.h"
 #include "sky/engine/platform/weborigin/SecurityPolicy.h"
 #include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/core/inspector/ScriptCallStack.h"
 #include "sky/engine/wtf/MainThread.h"
 #include "sky/engine/wtf/MathExtras.h"
 #include "sky/engine/wtf/text/WTFString.h"
 
 using std::min;
 using std::max;
 
 namespace blink {
 
 static void disableSuddenTermination()
@@ skipping 133 matching lines @@
 
 PassRefPtr<Document> LocalDOMWindow::installNewDocument(const DocumentInit& init)
 {
     ASSERT(init.frame() == m_frame);
 
     clearDocument();
 
     m_document = Document::create(init);
     m_application = Application::create(m_document.get(), m_document.get(), m_document->url().string());
     m_eventQueue = DOMWindowEventQueue::create(m_document.get());
+    m_frame->dart().CreateIsolateFor(m_document.get());
     m_document->attach();
 
-    m_frame->script().updateDocument();
     return m_document;
 }
 
 EventQueue* LocalDOMWindow::eventQueue() const
 {
     return m_eventQueue.get();
 }
 
 void LocalDOMWindow::enqueueWindowEvent(PassRefPtr<Event> event)
 {
@@ skipping 83 matching lines @@
 }
 
 void LocalDOMWindow::frameDestroyed()
 {
     FrameDestructionObserver::frameDestroyed();
     reset();
 }
 
 void LocalDOMWindow::willDetachFrameHost()
 {
-    m_frame->console().messageStorage()->frameWindowDiscarded(this);
+    // FIXME(sky): remove
 }
 
 void LocalDOMWindow::willDestroyDocumentInFrame()
 {
     // It is necessary to copy m_properties to a separate vector because the DOMWindowProperties may
     // unregister themselves from the LocalDOMWindow as a result of the call to willDestroyGlobalObjectInFrame.
     Vector<DOMWindowProperty*> properties;
     copyToVector(m_properties, properties);
     for (size_t i = 0; i < properties.size(); ++i)
         properties[i]->willDestroyGlobalObjectInFrame();
@@ skipping 23 matching lines @@
 {
     willDestroyDocumentInFrame();
     resetDOMWindowProperties();
 }
 
 void LocalDOMWindow::resetDOMWindowProperties()
 {
     m_properties.clear();
 
     m_screen = nullptr;
-    m_console = nullptr;
     m_location = nullptr;
 #if ENABLE(ASSERT)
     m_hasBeenReset = true;
 #endif
 }
 
 int LocalDOMWindow::orientation() const
 {
     ASSERT(RuntimeEnabledFeatures::orientationEventEnabled());
 
     int orientation = screenOrientationAngle(m_frame->view());
     // For backward compatibility, we want to return a value in the range of
     // [-90; 180] instead of [0; 360[ because window.orientation used to behave
     // like that in WebKit (this is a WebKit proprietary API).
     if (orientation == 270)
         return -90;
     return orientation;
 }
 
 Screen& LocalDOMWindow::screen() const
 {
     if (!m_screen)
         m_screen = Screen::create(m_frame);
     return *m_screen;
 }
 
-Console& LocalDOMWindow::console() const
-{
-    if (!m_console)
-        m_console = Console::create(m_frame);
-    return *m_console;
-}
-
 FrameConsole* LocalDOMWindow::frameConsole() const
 {
     return &m_frame->console();
 }
 
 Location& LocalDOMWindow::location() const
 {
     if (!m_location)
         m_location = Location::create(m_frame);
     return *m_location;
 }
 
 DOMSelection* LocalDOMWindow::getSelection()
 {
     return m_frame->document()->getSelection();
 }
 
-void LocalDOMWindow::focus(ExecutionContext* context)
+void LocalDOMWindow::focus()
 {
     if (!m_frame)
         return;
 
     FrameHost* host = m_frame->host();
     if (!host)
         return;
 
     host->page().focus();
 
@@ skipping 243 matching lines @@
     lifecycleNotifier().notifyRemoveAllEventListeners(this);
 
     removeAllUnloadEventListeners(this);
 }
 
 void LocalDOMWindow::removeAllEventListeners()
 {
     removeAllEventListenersInternal(DoBroadcastListenerRemoval);
 }
 
-void LocalDOMWindow::setLocation(const String& urlString, LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, SetLocationLocking locking)
+void LocalDOMWindow::setLocation(const String& urlString, SetLocationLocking locking)
 {
     // FIXME(sky): remove.
 }
 
 void LocalDOMWindow::printErrorMessage(const String& message)
 {
     if (message.isEmpty())
         return;
 
     frameConsole()->addMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
@@ skipping 10 matching lines @@
 {
     return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<LocalDOMWindow>::lifecycleNotifier());
 }
 
 PassOwnPtr<LifecycleNotifier<LocalDOMWindow> > LocalDOMWindow::createLifecycleNotifier()
 {
     return DOMWindowLifecycleNotifier::create(this);
 }
 
 } // namespace blink