Calculate damage rects before aggregating frame data.

cc/surfaces/surface_aggregator.h

 // 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.
 
 #ifndef CC_SURFACES_SURFACE_AGGREGATOR_H_
 #define CC_SURFACES_SURFACE_AGGREGATOR_H_
 
 #include <set>
 
 #include "base/containers/hash_tables.h"
@@ skipping 54 matching lines @@
                            const ClipData& clip_rect,
                            RenderPass* dest_render_pass);
   void CopyQuadsToPass(
       const QuadList& source_quad_list,
       const SharedQuadStateList& source_shared_quad_state_list,
       const base::hash_map<ResourceId, ResourceId>& resource_to_child_map,
       const gfx::Transform& target_transform,
       const ClipData& clip_rect,
       RenderPass* dest_pass,
       SurfaceId surface_id);
+  gfx::Rect ValidateAndCalculateDamageRect(SurfaceId surface_id);
   void CopyPasses(const DelegatedFrameData* frame_data, Surface* surface);
 
   // Remove Surfaces that were referenced before but aren't currently
   // referenced from the ResourceProvider.
   void RemoveUnreferencedChildren();
 
-  bool ValidateResources(Surface* surface,
-                         const DelegatedFrameData* frame_data);
   int ChildIdForSurface(Surface* surface);
   gfx::Rect DamageRectForSurface(const Surface* surface,
                                  const RenderPass& source,
                                  const gfx::Rect& full_rect);
 
   SurfaceManager* manager_;
   ResourceProvider* provider_;
 
   class RenderPassIdAllocator;
   typedef base::ScopedPtrHashMap<SurfaceId, scoped_ptr<RenderPassIdAllocator>>
@@ skipping 11 matching lines @@
   // This is the set of surfaces referenced in the aggregation so far, used to
   // detect cycles.
   typedef std::set<SurfaceId> SurfaceSet;
   SurfaceSet referenced_surfaces_;
 
   // For each Surface used in the last aggregation, gives the frame_index at
   // that time.
   SurfaceIndexMap previous_contained_surfaces_;
   SurfaceIndexMap contained_surfaces_;
 
+  // After surface validation, every Surface in this set is valid.
+  base::hash_set<SurfaceId> valid_surfaces_;
+
   // This is the pass list for the aggregated frame.
   RenderPassList* dest_pass_list_;
 
   // Resource list for the aggregated frame.
   TransferableResourceArray* dest_resource_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceAggregator);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_AGGREGATOR_H_