diff options
author | wkorman <wkorman@chromium.org> | 2015-11-17 16:30:29 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 00:31:57 +0000 |
commit | 5970a98218f47400b30f74136797af4bb8fbe024 (patch) | |
tree | 3e9ed0cea2e7bf193feb567f99cd901e016a0c29 | |
parent | c8be659cac0f05be6d0d3fd048a080aa63fa1714 (diff) | |
download | chromium_src-5970a98218f47400b30f74136797af4bb8fbe024.zip chromium_src-5970a98218f47400b30f74136797af4bb8fbe024.tar.gz chromium_src-5970a98218f47400b30f74136797af4bb8fbe024.tar.bz2 |
Remove unnecessary use of scoped_refptr for display item list.
BUG=529938
Review URL: https://codereview.chromium.org/1451233002
Cr-Commit-Position: refs/heads/master@{#360232}
-rw-r--r-- | cc/playback/display_item_list.cc | 2 | ||||
-rw-r--r-- | cc/playback/display_item_proto_factory.cc | 2 | ||||
-rw-r--r-- | cc/playback/display_item_proto_factory.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cc/playback/display_item_list.cc b/cc/playback/display_item_list.cc index 6d0edc65..6dd3778 100644 --- a/cc/playback/display_item_list.cc +++ b/cc/playback/display_item_list.cc @@ -60,7 +60,7 @@ scoped_refptr<DisplayItemList> DisplayItemList::CreateFromProto( for (int i = 0; i < proto.items_size(); i++) { const proto::DisplayItem& item_proto = proto.items(i); DisplayItem* item = - DisplayItemProtoFactory::AllocateAndConstruct(list, item_proto); + DisplayItemProtoFactory::AllocateAndConstruct(list.get(), item_proto); if (item) item->FromProtobuf(item_proto); } diff --git a/cc/playback/display_item_proto_factory.cc b/cc/playback/display_item_proto_factory.cc index b71fc9a..fae2b27 100644 --- a/cc/playback/display_item_proto_factory.cc +++ b/cc/playback/display_item_proto_factory.cc @@ -17,7 +17,7 @@ namespace cc { // static DisplayItem* DisplayItemProtoFactory::AllocateAndConstruct( - scoped_refptr<DisplayItemList> list, + DisplayItemList* list, const proto::DisplayItem& proto) { switch (proto.type()) { case proto::DisplayItem::Type_Clip: diff --git a/cc/playback/display_item_proto_factory.h b/cc/playback/display_item_proto_factory.h index 43325df..3db3b7e 100644 --- a/cc/playback/display_item_proto_factory.h +++ b/cc/playback/display_item_proto_factory.h @@ -18,7 +18,7 @@ class DisplayItem; class DisplayItemProtoFactory { public: - static DisplayItem* AllocateAndConstruct(scoped_refptr<DisplayItemList> list, + static DisplayItem* AllocateAndConstruct(DisplayItemList* list, const proto::DisplayItem& proto); private: |