Enqueuing new frames in a Surface should cause Displays to reaggregate it

cc/surfaces/display.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 "cc/surfaces/display.h"
 
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/software_renderer.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_aggregator.h"
 
 namespace cc {
 
 Display::Display(DisplayClient* client,
                  SurfaceManager* manager,
                  SharedBitmapManager* bitmap_manager)
-    : client_(client), manager_(manager), bitmap_manager_(bitmap_manager) {
+    : client_(client),
+      manager_(manager),
+      bitmap_manager_(bitmap_manager),
+      scheduled_draw_(false),
+      weak_ptr_factory_(this) {
 }
 
 Display::~Display() {
+  ClearSurfaceList();
 }
 
 void Display::Resize(SurfaceId id, const gfx::Size& size) {
   current_surface_id_ = id;
   current_surface_size_ = size;
+  ClearSurfaceList();
+  Draw();
 }
 
 void Display::InitializeOutputSurface() {
   if (output_surface_)
     return;
   scoped_ptr<OutputSurface> output_surface = client_->CreateOutputSurface();
   if (!output_surface->BindToClient(this))
     return;
 
   int highp_threshold_min = 0;
@@ skipping 29 matching lines @@
       return;
     renderer_ = renderer.Pass();
   }
 
   output_surface_ = output_surface.Pass();
   resource_provider_ = resource_provider.Pass();
   aggregator_.reset(new SurfaceAggregator(manager_, resource_provider_.get()));
 }
 
 bool Display::Draw() {
+  if (scheduled_draw_)
+    return true;
+  scheduled_draw_ = true;
+  base::MessageLoopProxy::current()->PostTask(

[jamesr, 2014/08/07 21:04:06]

the Display should not self-schedule. tell the client you have damage and let it
figure out if and when to draw

[piman, 2014/08/07 21:09:32]

drive-by: also going to MessageLoopProxy::current() would interact poorly with
ccameron's fixes for crbug.com/388005 and enne's STP Scheduler fix

+      FROM_HERE, base::Bind(&Display::DoDraw, weak_ptr_factory_.GetWeakPtr()));
+  return true;
+}
+
+void Display::DoDraw() {
+  TRACE_EVENT0("cc", "Display::DoDraw");
+  scheduled_draw_ = false;
   if (current_surface_id_.is_null())
-    return false;
+    return;
 
   InitializeOutputSurface();
   if (!output_surface_)
-    return false;
+    return;
 
+  ClearSurfaceList();
   scoped_ptr<CompositorFrame> frame =
-      aggregator_->Aggregate(current_surface_id_);
+      aggregator_->Aggregate(current_surface_id_, &contained_surfaces_);
+
+  for (std::set<Surface*>::iterator it = contained_surfaces_.begin();
+       it != contained_surfaces_.end();
+       ++it) {
+    (*it)->containing_displays().insert(this);
+  }
   if (!frame)
-    return false;
+    return;
 
-  TRACE_EVENT0("cc", "Display::Draw");
   DelegatedFrameData* frame_data = frame->delegated_frame_data.get();
 
   // Only reshape when we know we are going to draw. Otherwise, the reshape
   // can leave the window at the wrong size if we never draw and the proper
   // viewport size is never set.
   output_surface_->Reshape(current_surface_size_, 1.f);
   float device_scale_factor = 1.0f;
   gfx::Rect device_viewport_rect = gfx::Rect(current_surface_size_);
   gfx::Rect device_clip_rect = device_viewport_rect;
   bool disable_picture_quad_image_filtering = false;
 
   renderer_->DecideRenderPassAllocationsForFrame(frame_data->render_pass_list);
   renderer_->DrawFrame(&frame_data->render_pass_list,
                        device_scale_factor,
                        device_viewport_rect,
                        device_clip_rect,
                        disable_picture_quad_image_filtering);
   CompositorFrameMetadata metadata;
   renderer_->SwapBuffers(metadata);
-  return true;
+}
+
+void Display::ClearSurfaceList() {
+  for (std::set<Surface*>::iterator it = contained_surfaces_.begin();
+       it != contained_surfaces_.end();
+       ++it) {
+    (*it)->containing_displays().erase(this);
+  }
+
+  contained_surfaces_.clear();
 }
 
 SurfaceId Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 }  // namespace cc