Mandoline: Remove native_viewport.mojom

components/view_manager/display_manager.cc

Index: components/view_manager/display_manager.cc
diff --git a/components/view_manager/display_manager.cc b/components/view_manager/display_manager.cc
index 55e881a406c1b5ea2a87bf8a8597517200c41e6f..e3ee62716531889625351136402201beb23ae2e4 100644
--- a/components/view_manager/display_manager.cc
+++ b/components/view_manager/display_manager.cc
@@ -6,6 +6,7 @@
 
 #include "base/numerics/safe_conversions.h"
 #include "components/view_manager/connection_manager.h"
+#include "components/view_manager/gles2/gpu_state.h"
 #include "components/view_manager/public/interfaces/gpu.mojom.h"
 #include "components/view_manager/public/interfaces/quads.mojom.h"
 #include "components/view_manager/public/interfaces/surfaces.mojom.h"
@@ -74,8 +75,10 @@ void DrawViewTree(mojo::Pass* pass,
 
 DefaultDisplayManager::DefaultDisplayManager(
     mojo::ApplicationImpl* app_impl,
+    const scoped_refptr<gles2::GpuState>& gpu_state,
     const mojo::Callback<void()>& native_viewport_closed_callback)
     : app_impl_(app_impl),
+      gpu_state_(gpu_state),
       connection_manager_(nullptr),
       draw_timer_(false, false),
       frame_pending_(false),
@@ -88,20 +91,21 @@ DefaultDisplayManager::DefaultDisplayManager(
 
 void DefaultDisplayManager::Init(
     ConnectionManager* connection_manager,
-    mojo::NativeViewportEventDispatcherPtr event_dispatcher) {
+    EventDispatcher* event_dispatcher) {
   connection_manager_ = connection_manager;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
-  // TODO(beng): should not need to connect to ourselves, should just
-  //             create the appropriate platform window directly.
-  request->url = mojo::String::From("mojo:view_manager");
-  app_impl_->ConnectToService(request.Pass(),
-                              &native_viewport_);
-  native_viewport_.set_error_handler(this);
-  native_viewport_->Create(metrics_.size->Clone(),
-                           base::Bind(&DefaultDisplayManager::OnMetricsChanged,
-                                      weak_factory_.GetWeakPtr()));
+
+  native_viewport_.reset(new NativeViewport(metrics_.size.To<gfx::Size>(),
+                                            false /* is_headless */,
+                                            gpu_state_,
+                                            event_dispatcher,
+                                            native_viewport_closed_callback_));
+  native_viewport_->RequestMetrics(
+      base::Bind(&DefaultDisplayManager::OnMetricsChanged,
+                 weak_factory_.GetWeakPtr()));
   native_viewport_->Show();
 
+
   mojo::ContextProviderPtr context_provider;
   native_viewport_->GetContextProvider(GetProxy(&context_provider));
   mojo::DisplayFactoryPtr display_factory;
@@ -111,8 +115,6 @@ void DefaultDisplayManager::Init(
   display_factory->Create(context_provider.Pass(),
                           nullptr,  // returner - we never submit resources.
                           GetProxy(&display_));
-
-  native_viewport_->SetEventDispatcher(event_dispatcher.Pass());
 }
 
 DefaultDisplayManager::~DefaultDisplayManager() {
@@ -131,7 +133,7 @@ void DefaultDisplayManager::SchedulePaint(const ServerView* view,
 }
 
 void DefaultDisplayManager::SetViewportSize(const gfx::Size& size) {
-  native_viewport_->SetSize(Size::From(size));
+  native_viewport_->SetSize(size);
 }
 
 const mojo::ViewportMetrics& DefaultDisplayManager::GetViewportMetrics() {
@@ -170,12 +172,18 @@ void DefaultDisplayManager::WantToDraw() {
       base::Bind(&DefaultDisplayManager::Draw, base::Unretained(this)));
 }
 
-void DefaultDisplayManager::OnMetricsChanged(mojo::ViewportMetricsPtr metrics) {
-  metrics_.size = metrics->size.Clone();
-  metrics_.device_pixel_ratio = metrics->device_pixel_ratio;
-  gfx::Rect bounds(metrics_.size.To<gfx::Size>());
-  connection_manager_->root()->SetBounds(bounds);
-  connection_manager_->ProcessViewportMetricsChanged(metrics_, *metrics);
+void DefaultDisplayManager::OnMetricsChanged(const gfx::Size& size,
+                                             float device_scale_factor) {
+  mojo::ViewportMetrics metrics;
+  metrics.size = mojo::Size::From(size);
+  metrics.device_pixel_ratio = device_scale_factor;
+
+  connection_manager_->root()->SetBounds(gfx::Rect(size));
+  connection_manager_->ProcessViewportMetricsChanged(metrics_, metrics);
+
+  metrics_.size = metrics.size.Clone();
+  metrics_.device_pixel_ratio = metrics.device_pixel_ratio;
+
   native_viewport_->RequestMetrics(base::Bind(
       &DefaultDisplayManager::OnMetricsChanged, weak_factory_.GetWeakPtr()));
 }