Index: cc/playback/display_item_list.h |
diff --git a/cc/playback/display_item_list.h b/cc/playback/display_item_list.h |
index 02f2c7ec0bb3d2efd2d6bf43aa75afe6684c602b..710284e4c579c06173390638cf643dafada9c1ea 100644 |
--- a/cc/playback/display_item_list.h |
+++ b/cc/playback/display_item_list.h |
@@ -26,9 +26,9 @@ class SkCanvas; |
class SkPictureRecorder; |
namespace cc { |
+class ClientPictureCache; |
class DisplayItem; |
class DrawingDisplayItem; |
-class ImageSerializationProcessor; |
namespace proto { |
class DisplayItemList; |
@@ -51,13 +51,11 @@ class CC_EXPORT DisplayItemList |
// (crbug.com/548434). |
static scoped_refptr<DisplayItemList> CreateFromProto( |
const proto::DisplayItemList& proto, |
- ImageSerializationProcessor* image_serialization_processor); |
+ ClientPictureCache* client_picture_cache, |
+ std::vector<uint32_t>* used_engine_picture_ids); |
// Creates a Protobuf representing the state of this DisplayItemList. |
- // TODO(dtrainor): Don't resend DisplayItems that were already serialized |
- // (crbug.com/548434). |
- void ToProtobuf(proto::DisplayItemList* proto, |
- ImageSerializationProcessor* image_serialization_processor); |
+ void ToProtobuf(proto::DisplayItemList* proto); |
// TODO(trchen): Deprecated. Apply clip and scale on the canvas instead. |
void Raster(SkCanvas* canvas, |
@@ -112,6 +110,14 @@ class CC_EXPORT DisplayItemList |
gfx::Rect VisualRectForTesting(int index) { return visual_rects_[index]; } |
+ ContiguousContainer<DisplayItem>::const_iterator begin() const { |
+ return items_.begin(); |
+ } |
+ |
+ ContiguousContainer<DisplayItem>::const_iterator end() const { |
+ return items_.end(); |
+ } |
+ |
private: |
DisplayItemList(gfx::Rect layer_rect, |
const DisplayItemListSettings& display_list_settings, |