Nukes NativeViewportClient::OnCreated

mojo/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 "mojo/services/native_viewport/native_viewport_impl.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
@@ skipping 27 matching lines @@
   // TODO(jamesr): Should be mojo_gpu_service
   app->ConnectToService("mojo: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(SizePtr bounds) {
+void NativeViewportImpl::Create(SizePtr size,
+                                const Callback<void(uint64_t)>& callback) {
+  create_callback_ = callback;
   if (is_headless_)
     platform_viewport_ = PlatformViewportHeadless::Create(this);
   else
     platform_viewport_ = PlatformViewport::Create(this);
-  gfx::Rect rect = gfx::Rect(bounds.To<gfx::Size>());
-  platform_viewport_->Init(rect);
-  OnBoundsChanged(rect);
+  const gfx::Rect bounds(gfx::Rect(size.To<gfx::Size>()));
+  platform_viewport_->Init(bounds);
+  OnBoundsChanged(bounds);
 }
 
 void NativeViewportImpl::Show() {
   platform_viewport_->Show();
 }
 
 void NativeViewportImpl::Hide() {
   platform_viewport_->Hide();
 }
 
 void NativeViewportImpl::Close() {
   DCHECK(platform_viewport_);
   platform_viewport_->Close();
 }
 
-void NativeViewportImpl::SetBounds(SizePtr bounds) {
-  platform_viewport_->SetBounds(gfx::Rect(bounds.To<gfx::Size>()));
+void NativeViewportImpl::SetSize(SizePtr size) {
+  platform_viewport_->SetBounds(gfx::Rect(size.To<gfx::Size>()));
 }
 
 void NativeViewportImpl::SubmittedFrame(SurfaceIdPtr child_surface_id) {
   if (child_surface_id_.is_null()) {
     // If this is the first indication that the client will use surfaces,
     // initialize that system.
     // TODO(jamesr): When everything is converted to surfaces initialize this
     // eagerly.
     viewport_surface_.reset(
         new ViewportSurface(surfaces_service_.get(),
                             gpu_service_.get(),
-                            bounds_.size(),
+                            size_,
                             child_surface_id.To<cc::SurfaceId>()));
     if (widget_id_)
       viewport_surface_->SetWidgetId(widget_id_);
   }
   child_surface_id_ = child_surface_id.To<cc::SurfaceId>();
   if (viewport_surface_)
     viewport_surface_->SetChildId(child_surface_id_);
 }
 
 void NativeViewportImpl::OnBoundsChanged(const gfx::Rect& bounds) {
-  bounds_ = bounds;
-  client()->OnBoundsChanged(Size::From(bounds.size()));
+  size_ = bounds.size();
+  client()->OnSizeChanged(Size::From(size_));
   if (viewport_surface_)
-    viewport_surface_->SetSize(bounds.size());
+    viewport_surface_->SetSize(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.
-  client()->OnCreated(widget_id_);
+  create_callback_.Run(widget_id_);
   if (viewport_surface_)
     viewport_surface_->SetWidgetId(widget_id_);
 }
 
 bool NativeViewportImpl::OnEvent(ui::Event* ui_event) {
   // Must not return early before updating capture.
   switch (ui_event->type()) {
     case ui::ET_MOUSE_PRESSED:
     case ui::ET_TOUCH_PRESSED:
       platform_viewport_->SetCapture();
@@ skipping 19 matching lines @@
 void NativeViewportImpl::OnDestroyed() {
   client()->OnDestroyed();
 }
 
 void NativeViewportImpl::AckEvent() {
   waiting_for_event_ack_ = false;
 }
 
 }  // namespace mojo