Automatically redraw the display on resume.

services/surfaces/display_impl.cc

 // Copyright 2015 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/surfaces/display_impl.h"
 
+#include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/display.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "services/surfaces/context_provider_mojo.h"
 #include "services/surfaces/surfaces_output_surface.h"
 #include "services/surfaces/surfaces_scheduler.h"
 
 namespace surfaces {
 namespace {
 void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
   callback.Run();
 }
 }
 
 DisplayImpl::DisplayImpl(cc::SurfaceManager* manager,
                          cc::SurfaceId cc_id,
                          SurfacesScheduler* scheduler,
                          mojo::ContextProviderPtr context_provider,
                          mojo::ResourceReturnerPtr returner,
                          mojo::InterfaceRequest<mojo::Display> display_request)
     : manager_(manager),
       factory_(manager, this),
       cc_id_(cc_id),
       scheduler_(scheduler),
       context_provider_(context_provider.Pass()),
       returner_(returner.Pass()),
       viewport_param_binding_(this),
       display_binding_(this, display_request.Pass()) {
+  context_provider_->NotifyOnViewportCreated(
+      base::Bind(&DisplayImpl::OnViewportCreated, base::Unretained(this)));
+
   mojo::ViewportParameterListenerPtr viewport_parameter_listener;
   viewport_param_binding_.Bind(GetProxy(&viewport_parameter_listener));
   context_provider_->Create(
       viewport_parameter_listener.Pass(),
       base::Bind(&DisplayImpl::OnContextCreated, base::Unretained(this)));
   factory_.Create(cc_id_);
 }
 
 void DisplayImpl::OnContextCreated(mojo::CommandBufferPtr gles2_client) {
   DCHECK(!display_);
@@ skipping 24 matching lines @@
   pending_callback_ = callback;
   if (display_)
     Draw();
 }
 
 void DisplayImpl::Draw() {
   gfx::Size frame_size =
       pending_frame_->passes[0]->output_rect.To<gfx::Rect>().size();
   last_submitted_frame_size_ = frame_size;
   display_->Resize(frame_size);
-  factory_.SubmitFrame(cc_id_,
-                       pending_frame_.To<scoped_ptr<cc::CompositorFrame>>(),
-                       base::Bind(&CallCallback, pending_callback_));
+  factory_.SubmitFrame(
+      cc_id_, pending_frame_.Clone().To<scoped_ptr<cc::CompositorFrame>>(),
+      base::Bind(&CallCallback, pending_callback_));
   scheduler_->SetNeedsDraw();
-  pending_frame_.reset();
   pending_callback_.reset();
 }
 
+void DisplayImpl::OnViewportCreated() {
+  if (display_ && pending_frame_) {
+    Draw();
+  }
+  context_provider_->NotifyOnViewportCreated(
+      base::Bind(&DisplayImpl::OnViewportCreated, base::Unretained(this)));
+}
+
 void DisplayImpl::DisplayDamaged() {
 }
 
 void DisplayImpl::DidSwapBuffers() {
 }
 
 void DisplayImpl::DidSwapBuffersComplete() {
 }
 
 void DisplayImpl::CommitVSyncParameters(base::TimeTicks timebase,
@@ skipping 29 matching lines @@
   DCHECK(returner_);
 
   mojo::Array<mojo::ReturnedResourcePtr> ret(resources.size());
   for (size_t i = 0; i < resources.size(); ++i) {
     ret[i] = mojo::ReturnedResource::From(resources[i]);
   }
   returner_->ReturnResources(ret.Pass());
 }
 
 }  // namespace surfaces