| Index: cc/playback/display_item_list.cc
|
| diff --git a/cc/playback/display_item_list.cc b/cc/playback/display_item_list.cc
|
| index 6d0edc659819aa02caa59dbb70af72f57813686b..db7814aa378fdef7b0985cfd425c512de3fee163 100644
|
| --- a/cc/playback/display_item_list.cc
|
| +++ b/cc/playback/display_item_list.cc
|
| @@ -21,6 +21,7 @@
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| #include "third_party/skia/include/core/SkPictureRecorder.h"
|
| #include "third_party/skia/include/utils/SkPictureUtils.h"
|
| +#include "ui/gfx/geometry/rect.h"
|
| #include "ui/gfx/skia_util.h"
|
|
|
| namespace cc {
|
| @@ -59,8 +60,8 @@ 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);
|
| + DisplayItem* item = DisplayItemProtoFactory::AllocateAndConstruct(
|
| + layer_rect, list, item_proto);
|
| if (item)
|
| item->FromProtobuf(item_proto);
|
| }
|
| @@ -200,6 +201,15 @@ void DisplayItemList::RemoveLast() {
|
| }
|
|
|
| void DisplayItemList::Finalize() {
|
| + // TODO(wkorman): Uncomment the assert below once we've investigated
|
| + // and resolved issues.
|
| + // DCHECK_EQ(items_.size(), visual_rects_.size());
|
| +
|
| + // TODO(vmpstr): Build and make use of an RTree from the visual
|
| + // rects. For now we just clear them out since we won't ever need
|
| + // them to stick around post-Finalize.
|
| + visual_rects_.clear();
|
| +
|
| ProcessAppendedItems();
|
|
|
| if (settings_.use_cached_picture) {
|
|
|