Further plumb visual rect into cc:DisplayItemList.

cc/playback/display_item_list.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_PLAYBACK_DISPLAY_ITEM_LIST_H_
 #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 43 matching lines @@
               SkPicture::AbortCallback* callback,
               const gfx::Rect& canvas_target_playback_rect,
               float contents_scale) const;
 
   // This is a fast path for use only if canvas_ is set and
   // retain_individual_display_items_ is false. This method also updates
   // is_suitable_for_gpu_rasterization_ and approximate_op_count_.
   void RasterIntoCanvas(const DisplayItem& display_item);
 
   template <typename DisplayItemType>
-  DisplayItemType* CreateAndAppendItem() {
+  DisplayItemType* CreateAndAppendItem(const gfx::Rect& visual_rect) {
 #if DCHECK_IS_ON()
     needs_process_ = true;
 #endif
+    visual_rects_.push_back(visual_rect);
     ProcessAppendedItemsOnTheFly();
     return items_.AllocateAndConstruct<DisplayItemType>();
   }
 
   // Removes the last item. This cannot be called on lists with cached pictures
   // (since the data may already have been incorporated into cached picture
   // sizes, etc).
   void RemoveLast();
 
   // Called after all items are appended, to process the items and, if
@@ skipping 10 matching lines @@
   scoped_refptr<base::trace_event::ConvertableToTraceFormat> AsValue(
       bool include_items) const;
 
   void EmitTraceSnapshot() const;
 
   void GenerateDiscardableImagesMetadata();
   void GetDiscardableImagesInRect(const gfx::Rect& rect,
                                   float raster_scale,
                                   std::vector<DrawImage>* images);
 
+  gfx::Rect VisualRectForTesting(int index) { return visual_rects_[index]; }
+
  private:
   DisplayItemList(gfx::Rect layer_rect,
                   const DisplayItemListSettings& display_list_settings,
                   bool retain_individual_display_items);
   ~DisplayItemList();
 
   // While appending new items, if they are not being retained, this can process
   // periodically to avoid retaining all the items and processing at the end.
   void ProcessAppendedItemsOnTheFly();
   void ProcessAppendedItems();
 #if DCHECK_IS_ON()
   bool ProcessAppendedItemsCalled() const { return !needs_process_; }
   bool needs_process_;
 #else
   bool ProcessAppendedItemsCalled() const { return true; }
 #endif
 
   ListContainer<DisplayItem> items_;
+  // The visual rects associated with each of the display items in the
+  // display item list. There is one rect per display item, and the
+  // position in |visual_rects_| matches the position of the item in
+  // |items_| . These rects are intentionally kept separate
+  // because they are not needed while walking the |items_| for raster.
+  std::vector<gfx::Rect> visual_rects_;
   skia::RefPtr<SkPicture> picture_;
 
   scoped_ptr<SkPictureRecorder> recorder_;
   skia::RefPtr<SkCanvas> canvas_;
   const DisplayItemListSettings settings_;
   bool retain_individual_display_items_;
 
   gfx::Rect layer_rect_;
   bool is_suitable_for_gpu_rasterization_;
   int approximate_op_count_;
 
   // Memory usage due to the cached SkPicture.
   size_t picture_memory_usage_;
 
   // Memory usage due to external data held by display items.
   size_t external_memory_usage_;
 
   DiscardableImageMap image_map_;
 
   friend class base::RefCountedThreadSafe<DisplayItemList>;
   FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, ApproximateMemoryUsage);
   DISALLOW_COPY_AND_ASSIGN(DisplayItemList);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_DISPLAY_ITEM_LIST_H_