Remove NativeViewportClient

services/native_viewport/native_viewport_impl.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 "services/native_viewport/native_viewport_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 12 matching lines @@
 namespace {
 
 bool IsRateLimitedEventType(ui::Event* event) {
   return event->type() == ui::ET_MOUSE_MOVED ||
          event->type() == ui::ET_MOUSE_DRAGGED ||
          event->type() == ui::ET_TOUCH_MOVED;
 }
 
 }  // namespace
 
-NativeViewportImpl::NativeViewportImpl(mojo::ApplicationImpl* app,
-                                       bool is_headless)
+NativeViewportImpl::NativeViewportImpl(
+    mojo::ApplicationImpl* app,
+    bool is_headless,
+    mojo::InterfaceRequest<mojo::NativeViewport> request)
     : is_headless_(is_headless),
       widget_id_(0u),
+      sent_metrics_(false),
       metrics_(mojo::ViewportMetrics::New()),
       waiting_for_event_ack_(false),
+      binding_(this, request.Pass()),
       weak_factory_(this) {
+  binding_.set_error_handler(this);
   app->ConnectToService("mojo:surfaces_service", &surface_);
   // TODO(jamesr): Should be mojo_gpu_service
   app->ConnectToService("mojo:native_viewport_service", &gpu_service_);
 }
 
 NativeViewportImpl::~NativeViewportImpl() {
   // Destroy the NativeViewport early on as it may call us back during
   // destruction and we want to be in a known state.
   platform_viewport_.reset();
 }
 
 void NativeViewportImpl::Create(
     mojo::SizePtr size,
-    const mojo::Callback<void(uint64_t)>& callback) {
+    const mojo::Callback<void(uint64_t, mojo::ViewportMetricsPtr metrics)>&
+        callback) {
   create_callback_ = callback;
   metrics_->size = size.Clone();
   if (is_headless_)
     platform_viewport_ = PlatformViewportHeadless::Create(this);
   else
     platform_viewport_ = PlatformViewport::Create(this);
   platform_viewport_->Init(gfx::Rect(size.To<gfx::Size>()));
 }
 
+void NativeViewportImpl::RequestMetrics(const MetricsCallback& callback) {
+  if (!sent_metrics_) {
+    callback.Run(metrics_.Clone());
+    sent_metrics_ = true;
+    return;
+  }
+  metrics_callback_ = callback;
+}
+
 void NativeViewportImpl::Show() {
   platform_viewport_->Show();
 }
 
 void NativeViewportImpl::Hide() {
   platform_viewport_->Hide();
 }
 
 void NativeViewportImpl::Close() {
   DCHECK(platform_viewport_);
@@ skipping 24 matching lines @@
 void NativeViewportImpl::SetEventDispatcher(
     mojo::NativeViewportEventDispatcherPtr dispatcher) {
   event_dispatcher_ = dispatcher.Pass();
 }
 
 void NativeViewportImpl::OnMetricsChanged(mojo::ViewportMetricsPtr metrics) {
   if (metrics_->Equals(*metrics))
     return;
 
   metrics_ = metrics.Pass();
+  sent_metrics_ = false;
 
-  // Wait for the accelerated widget before telling the client of the bounds.
-  if (create_callback_.is_null())
-    ProcessOnMetricsChanged();
+  if (!metrics_callback_.is_null()) {
+    metrics_callback_.Run(metrics_.Clone());
+    metrics_callback_.reset();
+    sent_metrics_ = true;
+  }
+  if (viewport_surface_)
+    viewport_surface_->SetSize(metrics_->size.To<gfx::Size>());
 }
 
 void NativeViewportImpl::OnAcceleratedWidgetAvailable(
     gfx::AcceleratedWidget widget) {
   widget_id_ = static_cast<uint64_t>(bit_cast<uintptr_t>(widget));
   // TODO(jamesr): Remove once everything is converted to surfaces.
-  create_callback_.Run(widget_id_);
+  create_callback_.Run(widget_id_, metrics_.Clone());
+  sent_metrics_ = true;
   create_callback_.reset();
-  // Immediately tell the client the metrics. The size may be wrong, if so we'll
-  // get the right one in the next OnMetricsChanged() call.
-  ProcessOnMetricsChanged();
   if (viewport_surface_)
     viewport_surface_->SetWidgetId(widget_id_);
 }
 
 bool NativeViewportImpl::OnEvent(ui::Event* ui_event) {
   if (!event_dispatcher_.get())
     return false;
 
   // Must not return early before updating capture.
   switch (ui_event->type()) {
@@ skipping 13 matching lines @@
     return false;
 
   event_dispatcher_->OnEvent(
       mojo::Event::From(*ui_event),
       base::Bind(&NativeViewportImpl::AckEvent, weak_factory_.GetWeakPtr()));
   waiting_for_event_ack_ = true;
   return false;
 }
 
 void NativeViewportImpl::OnDestroyed() {
-  client()->OnDestroyed();
+  // This will signal a connection error and cause us to delete |this|.
+  binding_.Close();
+}
+
+void NativeViewportImpl::OnConnectionError() {
+  binding_.set_error_handler(nullptr);
+  delete this;
 }
 
 void NativeViewportImpl::AckEvent() {
   waiting_for_event_ack_ = false;
 }
 
-void NativeViewportImpl::ProcessOnMetricsChanged() {
-  client()->OnMetricsChanged(metrics_.Clone());
-  if (viewport_surface_)
-    viewport_surface_->SetSize(metrics_->size.To<gfx::Size>());
-}
-
 }  // namespace native_viewport