Merge the Sky Engine changes from the SkyDart branch

sky/viewer/document_view.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sky/viewer/document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 16 matching lines @@
 #include "sky/engine/public/platform/WebInputEvent.h"
 #include "sky/engine/public/platform/WebScreenInfo.h"
 #include "sky/engine/public/web/Sky.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/WebLocalFrame.h"
 #include "sky/engine/public/web/WebScriptSource.h"
 #include "sky/engine/public/web/WebSettings.h"
 #include "sky/engine/public/web/WebView.h"
-#include "sky/engine/v8_inspector/inspector_backend_mojo.h"
-#include "sky/engine/v8_inspector/inspector_host.h"
 #include "sky/viewer/converters/input_event_types.h"
 #include "sky/viewer/converters/url_request_types.h"
 #include "sky/viewer/internals.h"
 #include "sky/viewer/platform/weburlloader_impl.h"
 #include "sky/viewer/runtime_flags.h"
-#include "sky/viewer/script/script_runner.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #include "v8/include/v8.h"
 
 namespace sky {
 namespace {
 
 void ConfigureSettings(blink::WebSettings* settings) {
@@ skipping 38 matching lines @@
   return make_scoped_ptr(new ui::TouchEvent(
       ConvertEventTypeToUIEventType(event.type),
       gfx::PointF(pointer_event.x * device_pixel_ratio,
                   pointer_event.y * device_pixel_ratio),
       pointer_event.pointer,
       base::TimeDelta::FromMillisecondsD(pointer_event.timeStampMS)));
 }
 
 }  // namespace
 
-static int s_next_debugger_id = 1;
-
 DocumentView::DocumentView(
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exported_services,
     mojo::URLResponsePtr response,
     mojo::Shell* shell)
     : response_(response.Pass()),
       exported_services_(services.Pass()),
       shell_(shell),
       web_view_(nullptr),
       root_(nullptr),
       view_manager_client_factory_(shell_, this),
-      inspector_service_factory_(this),
       bitmap_rasterizer_(nullptr),
-      debugger_id_(s_next_debugger_id++),
       weak_factory_(this) {
   exported_services_.AddService(&view_manager_client_factory_);
-  inspector_service_provider_impl_.AddService(&inspector_service_factory_);
 }
 
 DocumentView::~DocumentView() {
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
   ui::GestureRecognizer::Get()->CleanupStateForConsumer(this);
 }
 
 base::WeakPtr<DocumentView> DocumentView::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 void DocumentView::OnEmbed(
     mojo::View* root,
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exposed_services) {
   root_ = root;
   imported_services_ = exposed_services.Pass();
   navigator_host_.set_service_provider(imported_services_.get());
 
-  if (services.is_pending())
-    inspector_service_provider_impl_.Bind(services.Pass());
-
   Load(response_.Pass());
 
   UpdateRootSizeAndViewportMetrics(root_->bounds());
 
   // TODO(abarth): We should ask the view whether it is focused instead of
   // assuming that we're focused.
   web_view_->setFocus(true);
   root_->AddObserver(this);
 }
 
@@ skipping 105 matching lines @@
   return blink::WebNavigationPolicyIgnore;
 }
 
 void DocumentView::didAddMessageToConsole(
     const blink::WebConsoleMessage& message,
     const blink::WebString& source_name,
     unsigned source_line,
     const blink::WebString& stack_trace) {
 }
 
-void DocumentView::didCreateScriptContext(blink::WebLocalFrame* frame,
-                                          v8::Handle<v8::Context> context) {
-  script_runner_.reset(new ScriptRunner(frame, context));
-
-  v8::Isolate* isolate = context->GetIsolate();
-  gin::Handle<Internals> internals = Internals::Create(isolate, this);
-  context->Global()->Set(gin::StringToV8(isolate, "internals"),
-                         gin::ConvertToV8(isolate, internals));
+void DocumentView::didCreateIsolate(blink::WebLocalFrame* frame,
+                                    Dart_Isolate isolate) {
+  Internals::Create(isolate, this);
 }
 
 blink::ServiceProvider* DocumentView::services() {
   return this;
 }
 
 mojo::NavigatorHost* DocumentView::NavigatorHost() {
   return navigator_host_.get();
 }
 
@@ skipping 58 matching lines @@
       for (auto& gesture : *gestures) {
         scoped_ptr<blink::WebInputEvent> gesture_event =
             ConvertEvent(mojo::Event::From(*gesture), device_pixel_ratio);
         if (gesture_event)
           web_view_->handleInputEvent(*gesture_event);
       }
     }
   }
 }
 
-class InspectorHostImpl : public inspector::InspectorHost {
- public:
-  InspectorHostImpl(blink::WebView* web_view, mojo::Shell* shell)
-      : web_view_(web_view), shell_(shell) {}
-
-  virtual ~InspectorHostImpl() {}
-
-  mojo::Shell* GetShell() override { return shell_; }
-  v8::Isolate* GetIsolate() override { return blink::mainThreadIsolate(); }
-  v8::Local<v8::Context> GetContext() override {
-    return web_view_->mainFrame()->mainWorldScriptContext();
-  }
-
- private:
-  blink::WebView* web_view_;
-  mojo::Shell* shell_;
-};
-
 void DocumentView::StartDebuggerInspectorBackend() {
-  if (!inspector_backend_) {
-    inspector_host_.reset(new InspectorHostImpl(web_view_, shell_));
-    inspector_backend_.reset(
-        new inspector::InspectorBackendMojo(inspector_host_.get()));
-  }
-  inspector_backend_->Connect();
+  // FIXME: Do we need this for dart?
 }
 
 }  // namespace sky