| Index: cc/playback/display_item_list.h
|
| diff --git a/cc/playback/display_item_list.h b/cc/playback/display_item_list.h
|
| index d5b5e88f5aefbaafe60690cb7aaf97b42c433723..20edbf62dad18ffdebb246d6270daf25c0b438fb 100644
|
| --- a/cc/playback/display_item_list.h
|
| +++ b/cc/playback/display_item_list.h
|
| @@ -28,13 +28,8 @@
|
| class SkCanvas;
|
|
|
| namespace cc {
|
| -class ClientPictureCache;
|
| class DisplayItem;
|
|
|
| -namespace proto {
|
| -class DisplayItemList;
|
| -}
|
| -
|
| class CC_EXPORT DisplayItemList
|
| : public base::RefCountedThreadSafe<DisplayItemList> {
|
| public:
|
| @@ -42,17 +37,6 @@ class CC_EXPORT DisplayItemList
|
| static scoped_refptr<DisplayItemList> Create(
|
| const DisplayItemListSettings& settings);
|
|
|
| - // Creates a DisplayItemList from a Protobuf.
|
| - // TODO(dtrainor): Pass in a list of possible DisplayItems to reuse
|
| - // (crbug.com/548434).
|
| - static scoped_refptr<DisplayItemList> CreateFromProto(
|
| - const proto::DisplayItemList& proto,
|
| - ClientPictureCache* client_picture_cache,
|
| - std::vector<uint32_t>* used_engine_picture_ids);
|
| -
|
| - // Creates a Protobuf representing the state of this DisplayItemList.
|
| - void ToProtobuf(proto::DisplayItemList* proto);
|
| -
|
| // TODO(trchen): Deprecated. Apply clip and scale on the canvas instead.
|
| void Raster(SkCanvas* canvas,
|
| SkPicture::AbortCallback* callback,
|
|
|