Merge the Sky Engine changes from the SkyDart branch

sky/engine/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 56 matching lines @@
 // triggering its deletion unless something else is still retaining a reference.
 //
 // Thie client is expected to be set whenever the WebLocalFrameImpl is attached to
 // the DOM.
 
 #include "sky/engine/config.h"
 #include "sky/engine/web/WebLocalFrameImpl.h"
 
 #include <algorithm>
 #include "mojo/public/cpp/system/data_pipe.h"
-#include "sky/engine/bindings/core/v8/DOMWrapperWorld.h"
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
-#include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h"
-#include "sky/engine/bindings/core/v8/ScriptController.h"
-#include "sky/engine/bindings/core/v8/ScriptSourceCode.h"
-#include "sky/engine/bindings/core/v8/ScriptValue.h"
-#include "sky/engine/bindings/core/v8/V8GCController.h"
-#include "sky/engine/bindings/core/v8/V8PerIsolateData.h"
+#include "sky/engine/bindings2/exception_state.h"
+#include "sky/engine/bindings2/exception_state_placeholder.h"
 #include "sky/engine/core/dom/Document.h"
 #include "sky/engine/core/dom/Node.h"
 #include "sky/engine/core/dom/NodeTraversal.h"
 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
 #include "sky/engine/core/editing/Editor.h"
 #include "sky/engine/core/editing/FrameSelection.h"
 #include "sky/engine/core/editing/InputMethodController.h"
 #include "sky/engine/core/editing/PlainTextRange.h"
 #include "sky/engine/core/editing/SpellChecker.h"
 #include "sky/engine/core/editing/TextAffinity.h"
 #include "sky/engine/core/editing/TextIterator.h"
 #include "sky/engine/core/editing/htmlediting.h"
-#include "sky/engine/core/frame/Console.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/Settings.h"
 #include "sky/engine/core/html/HTMLAnchorElement.h"
 #include "sky/engine/core/inspector/ConsoleMessage.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"
@@ skipping 22 matching lines @@
 #include "sky/engine/public/platform/WebSize.h"
 #include "sky/engine/public/platform/WebURLError.h"
 #include "sky/engine/public/platform/WebVector.h"
 #include "sky/engine/public/web/WebConsoleMessage.h"
 #include "sky/engine/public/web/WebDocument.h"
 #include "sky/engine/public/web/WebElement.h"
 #include "sky/engine/public/web/WebFrameClient.h"
 #include "sky/engine/public/web/WebNode.h"
 #include "sky/engine/public/web/WebRange.h"
 #include "sky/engine/public/web/WebScriptSource.h"
-#include "sky/engine/core/inspector/ScriptCallStack.h"
 #include "sky/engine/web/CompositionUnderlineVectorBuilder.h"
 #include "sky/engine/web/WebViewImpl.h"
 #include "sky/engine/wtf/CurrentTime.h"
 #include "sky/engine/wtf/HashMap.h"
 
 namespace blink {
 
 static int frameCount = 0;
 
 // Key for a StatsCounter tracking how many WebFrames are active.
 static const char webFrameActiveCount[] = "WebFrameActiveCount";
 
 static void frameContentAsPlainText(size_t maxChars, LocalFrame* frame, StringBuilder& output)
 {
     Document* document = frame->document();
     if (!document)
         return;
 
     if (!frame->view())
         return;
 
     // Select the document body.
     RefPtr<Range> range(document->createRange());
     TrackExceptionState exceptionState;
     range->selectNodeContents(document->documentElement(), exceptionState);
 
-    if (!exceptionState.hadException()) {
+    if (!exceptionState.had_exception()) {
         // The text iterator will walk nodes giving us text. This is similar to
         // the plainText() function in core/editing/TextIterator.h, but we implement the maximum
         // size and also copy the results directly into a wstring, avoiding the
         // string conversion.
         for (TextIterator it(range.get()); !it.atEnd(); it.advance()) {
             it.appendTextToStringBuilder(output, 0, maxChars - output.length());
             if (output.length() >= maxChars)
                 return; // Filled up the buffer.
         }
     }
 }
 
 // WebFrame -------------------------------------------------------------------
 
 int WebFrame::instanceCount()
 {
     return frameCount;
 }
 
-WebLocalFrame* WebLocalFrame::frameForCurrentContext()
-{
-    v8::Handle<v8::Context> context = v8::Isolate::GetCurrent()->GetCurrentContext();
-    if (context.IsEmpty())
-        return 0;
-    return frameForContext(context);
-}
-
-WebLocalFrame* WebLocalFrame::frameForContext(v8::Handle<v8::Context> context)
-{
-    return WebLocalFrameImpl::fromFrame(toFrameIfNotDetached(context));
-}
-
 bool WebLocalFrameImpl::isWebLocalFrame() const
 {
     return true;
 }
 
 WebLocalFrame* WebLocalFrameImpl::toWebLocalFrame()
 {
     return this;
 }
 
@@ skipping 27 matching lines @@
 WebDocument WebLocalFrameImpl::document() const
 {
     if (!frame() || !frame()->document())
         return WebDocument();
     return WebDocument(frame()->document());
 }
 
 void WebLocalFrameImpl::executeScript(const WebScriptSource& source)
 {
     ASSERT(frame());
-    TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), OrdinalNumber::first());
-    v8::HandleScope handleScope(toIsolate(frame()));
-    frame()->script().executeScriptInMainWorld(ScriptSourceCode(source.code, source.url, position));
+    // TODO(dart)
 }
 
 void WebLocalFrameImpl::addMessageToConsole(const WebConsoleMessage& message)
 {
     ASSERT(frame());
 
     MessageLevel webCoreMessageLevel;
     switch (message.level) {
     case WebConsoleMessage::LevelDebug:
         webCoreMessageLevel = DebugMessageLevel;
@@ skipping 10 matching lines @@
     default:
         ASSERT_NOT_REACHED();
         return;
     }
 
     frame()->document()->addConsoleMessage(ConsoleMessage::create(OtherMessageSource, webCoreMessageLevel, message.text));
 }
 
 void WebLocalFrameImpl::collectGarbage()
 {
-    if (!frame())
-        return;
-    V8GCController::collectGarbage(v8::Isolate::GetCurrent());
-}
-
-v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebScriptSource& source)
-{
-    ASSERT(frame());
-    TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), OrdinalNumber::first());
-    return frame()->script().executeScriptInMainWorldAndReturnValue(ScriptSourceCode(source.code, source.url, position));
-}
-
-v8::Handle<v8::Value> WebLocalFrameImpl::callFunctionEvenIfScriptDisabled(v8::Handle<v8::Function> function, v8::Handle<v8::Value> receiver, int argc, v8::Handle<v8::Value> argv[])
-{
-    ASSERT(frame());
-    return frame()->script().callFunction(function, receiver, argc, argv);
-}
-
-v8::Local<v8::Context> WebLocalFrameImpl::mainWorldScriptContext() const
-{
-    return toV8Context(frame(), DOMWrapperWorld::mainWorld());
+    // TODO(dart): Implement.
 }
 
 void WebLocalFrameImpl::load(const WebURL& url, mojo::ScopedDataPipeConsumerHandle responseStream)
 {
     frame()->mojoLoader().load(url, responseStream.Pass());
 }
 
 void WebLocalFrameImpl::replaceSelection(const WebString& text)
 {
     bool selectReplacement = false;
@@ skipping 342 matching lines @@
 
 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offset, float contentScaleFactor)
 {
     m_inputEventsOffsetForEmulation = offset;
     m_inputEventsScaleFactorForEmulation = contentScaleFactor;
     if (frame()->view())
         frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffsetForEmulation, m_inputEventsScaleFactorForEmulation);
 }
 
 } // namespace blink