Aggregate damage rects in surface aggregator

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"
@@ skipping 71 matching lines @@
 }
 
 bool Display::Draw() {
   if (current_surface_id_.is_null())
     return false;
 
   InitializeOutputSurface();
   if (!output_surface_)
     return false;
 
-  contained_surfaces_.clear();
-
   scoped_ptr<CompositorFrame> frame =
-      aggregator_->Aggregate(current_surface_id_, &contained_surfaces_);
+      aggregator_->Aggregate(current_surface_id_);
   if (!frame)
     return false;
 
   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);
-  for (std::set<SurfaceId>::iterator it = contained_surfaces_.begin();
-       it != contained_surfaces_.end();
+  for (SurfaceAggregator::SurfaceIndexMap::iterator it =
+           aggregator_->previous_contained_surfaces().begin();
+       it != aggregator_->previous_contained_surfaces().end();
        ++it) {
-    Surface* surface = manager_->GetSurfaceForId(*it);
+    Surface* surface = manager_->GetSurfaceForId(it->first);
     if (surface)
       surface->RunDrawCallbacks();
   }
   return true;
 }
 
 void Display::OnSurfaceDamaged(SurfaceId surface) {
-  if (contained_surfaces_.find(surface) != contained_surfaces_.end())
+  if (aggregator_ && aggregator_->previous_contained_surfaces().count(surface))
     client_->DisplayDamaged();
 }
 
 SurfaceId Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 }  // namespace cc