Wire up the Inspector V8 Debugger

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 46 matching lines @@
     case blink::WebNavigationPolicyNewWindow:
     case blink::WebNavigationPolicyNewPopup:
       return mojo::TARGET_NEW_NODE;
     default:
       return mojo::TARGET_DEFAULT;
   }
 }
 
 }  // namespace
 
+static int s_next_debugger_id = 1;
+
 DocumentView::DocumentView(
     mojo::URLResponsePtr response,
     mojo::ShellPtr shell,
     scoped_refptr<base::MessageLoopProxy> compositor_thread)
     : response_(response.Pass()),
       shell_(shell.Pass()),
       web_view_(NULL),
       root_(NULL),
       view_manager_client_factory_(shell_.get(), this),
       inspector_service_factory_(this),
       compositor_thread_(compositor_thread),
+      debugger_id_(s_next_debugger_id++),

[eseidel, 2014/11/18 19:38:48]

This ended up not being used, will remove.

[abarth-chromium, 2014/11/18 22:37:37]

ok

       weak_factory_(this) {
   shell_.set_client(this);
 }
 
 DocumentView::~DocumentView() {
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
@@ skipping 96 matching lines @@
     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,
                                           int extensionGroup,
                                           int worldId) {
-  if (frame != web_view_->mainFrame())
-    return;
   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));
 }
 
 blink::ServiceProvider& DocumentView::services() {
   return *this;
 }
 
 mojo::NavigatorHost* DocumentView::NavigatorHost() {
   return navigator_host_.get();
 }
 
+mojo::Shell* DocumentView::Shell() {
+  return shell_.get();
+}
+
 void DocumentView::OnViewBoundsChanged(mojo::View* view,
                                        const mojo::Rect& old_bounds,
                                        const mojo::Rect& new_bounds) {
   DCHECK_EQ(view, root_);
   gfx::Size size = new_bounds.To<gfx::Rect>().size();
   web_view_->resize(size);
   web_layer_tree_view_impl_->setViewportSize(size);
 }
 
 void DocumentView::OnViewFocusChanged(mojo::View* gained_focus,
@@ skipping 13 matching lines @@
 
 void DocumentView::OnViewInputEvent(
     mojo::View* view, const mojo::EventPtr& event) {
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent> >();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace sky