Chromium Code Reviews| Index: cc/playback/display_item_proto_factory.cc |
| diff --git a/cc/playback/display_item_proto_factory.cc b/cc/playback/display_item_proto_factory.cc |
| index b71fc9ae6e0f3a78f0be524e27148459626c5703..e0cc46eb305107a3a24835aa8d11062a912cb0ee 100644 |
| --- a/cc/playback/display_item_proto_factory.cc |
| +++ b/cc/playback/display_item_proto_factory.cc |
| @@ -12,40 +12,42 @@ |
| #include "cc/playback/float_clip_display_item.h" |
| #include "cc/playback/transform_display_item.h" |
| #include "cc/proto/display_item.pb.h" |
| +#include "ui/gfx/geometry/rect.h" |
| namespace cc { |
| // static |
| DisplayItem* DisplayItemProtoFactory::AllocateAndConstruct( |
| + const gfx::Rect& visual_rect, |
| scoped_refptr<DisplayItemList> list, |
|
danakj
2015/11/05 23:54:27
er, why is this a scoped_refptr<DisplayItemList> a
wkorman
2015/11/17 01:47:23
I'll send a separate change to do that to avoid co
|
| const proto::DisplayItem& proto) { |
| switch (proto.type()) { |
| case proto::DisplayItem::Type_Clip: |
| - return list->CreateAndAppendItem<ClipDisplayItem>(); |
| + return list->CreateAndAppendItem<ClipDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_EndClip: |
| - return list->CreateAndAppendItem<EndClipDisplayItem>(); |
| + return list->CreateAndAppendItem<EndClipDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_ClipPath: |
| - return list->CreateAndAppendItem<ClipPathDisplayItem>(); |
| + return list->CreateAndAppendItem<ClipPathDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_EndClipPath: |
| - return list->CreateAndAppendItem<EndClipPathDisplayItem>(); |
| + return list->CreateAndAppendItem<EndClipPathDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_Compositing: |
| - return list->CreateAndAppendItem<CompositingDisplayItem>(); |
| + return list->CreateAndAppendItem<CompositingDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_EndCompositing: |
| - return list->CreateAndAppendItem<EndCompositingDisplayItem>(); |
| + return list->CreateAndAppendItem<EndCompositingDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_Drawing: |
| - return list->CreateAndAppendItem<DrawingDisplayItem>(); |
| + return list->CreateAndAppendItem<DrawingDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_Filter: |
| - return list->CreateAndAppendItem<FilterDisplayItem>(); |
| + return list->CreateAndAppendItem<FilterDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_EndFilter: |
| - return list->CreateAndAppendItem<EndFilterDisplayItem>(); |
| + return list->CreateAndAppendItem<EndFilterDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_FloatClip: |
| - return list->CreateAndAppendItem<FloatClipDisplayItem>(); |
| + return list->CreateAndAppendItem<FloatClipDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_EndFloatClip: |
| - return list->CreateAndAppendItem<EndFloatClipDisplayItem>(); |
| + return list->CreateAndAppendItem<EndFloatClipDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_Transform: |
| - return list->CreateAndAppendItem<TransformDisplayItem>(); |
| + return list->CreateAndAppendItem<TransformDisplayItem>(visual_rect); |
| case proto::DisplayItem::Type_EndTransform: |
| - return list->CreateAndAppendItem<EndTransformDisplayItem>(); |
| + return list->CreateAndAppendItem<EndTransformDisplayItem>(visual_rect); |
| } |
| NOTREACHED(); |