OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/playback/display_item_proto_factory.h" | 5 #include "cc/playback/display_item_proto_factory.h" |
6 | 6 |
7 #include "cc/playback/clip_display_item.h" | 7 #include "cc/playback/clip_display_item.h" |
8 #include "cc/playback/clip_path_display_item.h" | 8 #include "cc/playback/clip_path_display_item.h" |
9 #include "cc/playback/compositing_display_item.h" | 9 #include "cc/playback/compositing_display_item.h" |
10 #include "cc/playback/drawing_display_item.h" | 10 #include "cc/playback/drawing_display_item.h" |
11 #include "cc/playback/filter_display_item.h" | 11 #include "cc/playback/filter_display_item.h" |
12 #include "cc/playback/float_clip_display_item.h" | 12 #include "cc/playback/float_clip_display_item.h" |
13 #include "cc/playback/transform_display_item.h" | 13 #include "cc/playback/transform_display_item.h" |
14 #include "cc/proto/display_item.pb.h" | 14 #include "cc/proto/display_item.pb.h" |
15 #include "ui/gfx/geometry/rect.h" | 15 #include "ui/gfx/geometry/rect.h" |
16 | 16 |
17 namespace cc { | 17 namespace cc { |
18 | 18 |
19 // static | 19 // static |
20 void DisplayItemProtoFactory::AllocateAndConstruct( | 20 DisplayItem* DisplayItemProtoFactory::AllocateAndConstruct( |
21 const gfx::Rect& visual_rect, | 21 const gfx::Rect& visual_rect, |
22 DisplayItemList* list, | 22 DisplayItemList* list, |
23 const proto::DisplayItem& proto) { | 23 const proto::DisplayItem& proto) { |
24 switch (proto.type()) { | 24 switch (proto.type()) { |
25 case proto::DisplayItem::Type_Clip: | 25 case proto::DisplayItem::Type_Clip: |
26 list->CreateAndAppendItem<ClipDisplayItem>(visual_rect, proto); | 26 return list->CreateAndAppendItem<ClipDisplayItem>(visual_rect); |
27 return; | |
28 case proto::DisplayItem::Type_EndClip: | 27 case proto::DisplayItem::Type_EndClip: |
29 list->CreateAndAppendItem<EndClipDisplayItem>(visual_rect, proto); | 28 return list->CreateAndAppendItem<EndClipDisplayItem>(visual_rect); |
30 return; | |
31 case proto::DisplayItem::Type_ClipPath: | 29 case proto::DisplayItem::Type_ClipPath: |
32 list->CreateAndAppendItem<ClipPathDisplayItem>(visual_rect, proto); | 30 return list->CreateAndAppendItem<ClipPathDisplayItem>(visual_rect); |
33 return; | |
34 case proto::DisplayItem::Type_EndClipPath: | 31 case proto::DisplayItem::Type_EndClipPath: |
35 list->CreateAndAppendItem<EndClipPathDisplayItem>(visual_rect, proto); | 32 return list->CreateAndAppendItem<EndClipPathDisplayItem>(visual_rect); |
36 return; | |
37 case proto::DisplayItem::Type_Compositing: | 33 case proto::DisplayItem::Type_Compositing: |
38 list->CreateAndAppendItem<CompositingDisplayItem>(visual_rect, proto); | 34 return list->CreateAndAppendItem<CompositingDisplayItem>(visual_rect); |
39 return; | |
40 case proto::DisplayItem::Type_EndCompositing: | 35 case proto::DisplayItem::Type_EndCompositing: |
41 list->CreateAndAppendItem<EndCompositingDisplayItem>(visual_rect, proto); | 36 return list->CreateAndAppendItem<EndCompositingDisplayItem>(visual_rect); |
42 return; | |
43 case proto::DisplayItem::Type_Drawing: | 37 case proto::DisplayItem::Type_Drawing: |
44 list->CreateAndAppendItem<DrawingDisplayItem>(visual_rect, proto); | 38 return list->CreateAndAppendItem<DrawingDisplayItem>(visual_rect); |
45 return; | |
46 case proto::DisplayItem::Type_Filter: | 39 case proto::DisplayItem::Type_Filter: |
47 list->CreateAndAppendItem<FilterDisplayItem>(visual_rect, proto); | 40 return list->CreateAndAppendItem<FilterDisplayItem>(visual_rect); |
48 return; | |
49 case proto::DisplayItem::Type_EndFilter: | 41 case proto::DisplayItem::Type_EndFilter: |
50 list->CreateAndAppendItem<EndFilterDisplayItem>(visual_rect, proto); | 42 return list->CreateAndAppendItem<EndFilterDisplayItem>(visual_rect); |
51 return; | |
52 case proto::DisplayItem::Type_FloatClip: | 43 case proto::DisplayItem::Type_FloatClip: |
53 list->CreateAndAppendItem<FloatClipDisplayItem>(visual_rect, proto); | 44 return list->CreateAndAppendItem<FloatClipDisplayItem>(visual_rect); |
54 return; | |
55 case proto::DisplayItem::Type_EndFloatClip: | 45 case proto::DisplayItem::Type_EndFloatClip: |
56 list->CreateAndAppendItem<EndFloatClipDisplayItem>(visual_rect, proto); | 46 return list->CreateAndAppendItem<EndFloatClipDisplayItem>(visual_rect); |
57 return; | |
58 case proto::DisplayItem::Type_Transform: | 47 case proto::DisplayItem::Type_Transform: |
59 list->CreateAndAppendItem<TransformDisplayItem>(visual_rect, proto); | 48 return list->CreateAndAppendItem<TransformDisplayItem>(visual_rect); |
60 return; | |
61 case proto::DisplayItem::Type_EndTransform: | 49 case proto::DisplayItem::Type_EndTransform: |
62 list->CreateAndAppendItem<EndTransformDisplayItem>(visual_rect, proto); | 50 return list->CreateAndAppendItem<EndTransformDisplayItem>(visual_rect); |
63 return; | |
64 } | 51 } |
65 | 52 |
66 NOTREACHED(); | 53 NOTREACHED(); |
| 54 return nullptr; |
67 } | 55 } |
68 | 56 |
69 } // namespace cc | 57 } // namespace cc |
OLD | NEW |