Merge the Sky Engine changes from the SkyDart branch

sky/viewer/document_view.h

 // 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.
 
 #ifndef SKY_VIEWER_DOCUMENT_VIEW_H_
 #define SKY_VIEWER_DOCUMENT_VIEW_H_
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/application/lazy_interface_ptr.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/cpp/bindings/interface_impl.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
 #include "sky/compositor/layer_client.h"
 #include "sky/compositor/layer_host_client.h"
 #include "sky/engine/public/platform/ServiceProvider.h"
 #include "sky/engine/public/web/WebFrameClient.h"
 #include "sky/engine/public/web/WebViewClient.h"
-#include "sky/viewer/services/inspector_impl.h"
 #include "ui/events/gestures/gesture_types.h"
 
 namespace mojo {
 class ViewManager;
 class View;
 }
 
-namespace inspector {
-class InspectorBackendMojo;
-}
-
 namespace sky {
-class InspectorHostImpl;
 class Rasterizer;
 class RasterizerBitmap;
-class ScriptRunner;
 class Layer;
 class LayerHost;
 
 class DocumentView : public blink::ServiceProvider,
                      public blink::WebFrameClient,
                      public blink::WebViewClient,
                      public mojo::ViewManagerDelegate,
                      public mojo::ViewObserver,
                      public sky::LayerClient,
                      public sky::LayerHostClient,
@@ skipping 34 matching lines @@
   // WebFrameClient methods:
   mojo::View* createChildFrame() override;
   void frameDetached(blink::WebFrame*) override;
   blink::WebNavigationPolicy decidePolicyForNavigation(
     const blink::WebFrameClient::NavigationPolicyInfo& info) override;
   void didAddMessageToConsole(
       const blink::WebConsoleMessage& message,
       const blink::WebString& source_name,
       unsigned source_line,
       const blink::WebString& stack_trace) override;
-  void didCreateScriptContext(
-      blink::WebLocalFrame*,
-      v8::Handle<v8::Context>) override;
+  void didCreateIsolate(blink::WebLocalFrame* frame,
+                        Dart_Isolate isolate) override;
 
   // WebViewClient methods:
   blink::ServiceProvider* services() override;
 
   // Services methods:
   mojo::NavigatorHost* NavigatorHost() override;
 
   // ViewManagerDelegate methods:
   void OnEmbed(mojo::View* root,
                mojo::InterfaceRequest<mojo::ServiceProvider> services,
@@ skipping 20 matching lines @@
   void UpdateRootSizeAndViewportMetrics(const mojo::Rect& new_bounds);
 
   mojo::URLResponsePtr response_;
   mojo::ServiceProviderImpl exported_services_;
   mojo::ServiceProviderPtr imported_services_;
   mojo::Shell* shell_;
   mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_;
   blink::WebView* web_view_;
   mojo::View* root_;
   mojo::ViewManagerClientFactory view_manager_client_factory_;
-  InspectorServiceFactory inspector_service_factory_;
-  mojo::ServiceProviderImpl inspector_service_provider_impl_;
   scoped_ptr<LayerHost> layer_host_;
   scoped_refptr<Layer> root_layer_;
   RasterizerBitmap* bitmap_rasterizer_;  // Used for pixel tests.
-  scoped_ptr<ScriptRunner> script_runner_;
-  scoped_ptr<InspectorHostImpl> inspector_host_;
-  scoped_ptr<inspector::InspectorBackendMojo> inspector_backend_;
-  int debugger_id_;
 
   base::WeakPtrFactory<DocumentView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DocumentView);
 };
 
 }  // namespace sky
 
 #endif  // SKY_VIEWER_DOCUMENT_VIEW_H_