Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: cc/blink/web_display_item_list_impl.cc

Issue 1123983002: cc: Use a ListContainer for DisplayItemList to reduce allocations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: displaylistcontainer: fixdcheck Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/BUILD.gn ('k') | cc/cc.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/blink/web_display_item_list_impl.h" 5 #include "cc/blink/web_display_item_list_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "cc/blink/web_filter_operations_impl.h" 9 #include "cc/blink/web_filter_operations_impl.h"
10 #include "cc/resources/clip_display_item.h" 10 #include "cc/resources/clip_display_item.h"
(...skipping 13 matching lines...) Expand all
24 #include "ui/gfx/transform.h" 24 #include "ui/gfx/transform.h"
25 25
26 namespace cc_blink { 26 namespace cc_blink {
27 27
28 WebDisplayItemListImpl::WebDisplayItemListImpl( 28 WebDisplayItemListImpl::WebDisplayItemListImpl(
29 cc::DisplayItemList* display_list) 29 cc::DisplayItemList* display_list)
30 : display_item_list_(display_list) { 30 : display_item_list_(display_list) {
31 } 31 }
32 32
33 void WebDisplayItemListImpl::appendDrawingItem(const SkPicture* picture) { 33 void WebDisplayItemListImpl::appendDrawingItem(const SkPicture* picture) {
34 display_item_list_->AppendItem(cc::DrawingDisplayItem::Create( 34 auto* item =
35 skia::SharePtr(const_cast<SkPicture*>(picture)))); 35 display_item_list_->CreateAndAppendItem<cc::DrawingDisplayItem>();
36 item->SetNew(skia::SharePtr(const_cast<SkPicture*>(picture)));
36 } 37 }
37 38
38 void WebDisplayItemListImpl::appendClipItem( 39 void WebDisplayItemListImpl::appendClipItem(
39 const blink::WebRect& clip_rect, 40 const blink::WebRect& clip_rect,
40 const blink::WebVector<SkRRect>& rounded_clip_rects) { 41 const blink::WebVector<SkRRect>& rounded_clip_rects) {
41 std::vector<SkRRect> rounded_rects; 42 std::vector<SkRRect> rounded_rects;
42 for (size_t i = 0; i < rounded_clip_rects.size(); ++i) { 43 for (size_t i = 0; i < rounded_clip_rects.size(); ++i) {
43 rounded_rects.push_back(rounded_clip_rects[i]); 44 rounded_rects.push_back(rounded_clip_rects[i]);
44 } 45 }
45 display_item_list_->AppendItem( 46 auto* item = display_item_list_->CreateAndAppendItem<cc::ClipDisplayItem>();
46 cc::ClipDisplayItem::Create(clip_rect, rounded_rects)); 47 item->SetNew(clip_rect, rounded_rects);
47 } 48 }
48 49
49 void WebDisplayItemListImpl::appendEndClipItem() { 50 void WebDisplayItemListImpl::appendEndClipItem() {
50 display_item_list_->AppendItem(cc::EndClipDisplayItem::Create()); 51 display_item_list_->CreateAndAppendItem<cc::EndClipDisplayItem>();
51 } 52 }
52 53
53 void WebDisplayItemListImpl::appendClipPathItem(const SkPath& clip_path, 54 void WebDisplayItemListImpl::appendClipPathItem(const SkPath& clip_path,
54 SkRegion::Op clip_op, 55 SkRegion::Op clip_op,
55 bool antialias) { 56 bool antialias) {
56 display_item_list_->AppendItem( 57 auto* item =
57 cc::ClipPathDisplayItem::Create(clip_path, clip_op, antialias)); 58 display_item_list_->CreateAndAppendItem<cc::ClipPathDisplayItem>();
59 item->SetNew(clip_path, clip_op, antialias);
58 } 60 }
59 61
60 void WebDisplayItemListImpl::appendEndClipPathItem() { 62 void WebDisplayItemListImpl::appendEndClipPathItem() {
61 display_item_list_->AppendItem(cc::EndClipPathDisplayItem::Create()); 63 display_item_list_->CreateAndAppendItem<cc::EndClipPathDisplayItem>();
62 } 64 }
63 65
64 void WebDisplayItemListImpl::appendFloatClipItem( 66 void WebDisplayItemListImpl::appendFloatClipItem(
65 const blink::WebFloatRect& clip_rect) { 67 const blink::WebFloatRect& clip_rect) {
66 display_item_list_->AppendItem(cc::FloatClipDisplayItem::Create(clip_rect)); 68 auto* item =
69 display_item_list_->CreateAndAppendItem<cc::FloatClipDisplayItem>();
70 item->SetNew(clip_rect);
67 } 71 }
68 72
69 void WebDisplayItemListImpl::appendEndFloatClipItem() { 73 void WebDisplayItemListImpl::appendEndFloatClipItem() {
70 display_item_list_->AppendItem(cc::EndFloatClipDisplayItem::Create()); 74 display_item_list_->CreateAndAppendItem<cc::EndFloatClipDisplayItem>();
71 } 75 }
72 76
73 void WebDisplayItemListImpl::appendTransformItem(const SkMatrix44& matrix) { 77 void WebDisplayItemListImpl::appendTransformItem(const SkMatrix44& matrix) {
74 gfx::Transform transform; 78 gfx::Transform transform;
75 transform.matrix() = matrix; 79 transform.matrix() = matrix;
76 display_item_list_->AppendItem(cc::TransformDisplayItem::Create(transform)); 80 auto* item =
81 display_item_list_->CreateAndAppendItem<cc::TransformDisplayItem>();
82 item->SetNew(transform);
77 } 83 }
78 84
79 void WebDisplayItemListImpl::appendEndTransformItem() { 85 void WebDisplayItemListImpl::appendEndTransformItem() {
80 display_item_list_->AppendItem(cc::EndTransformDisplayItem::Create()); 86 display_item_list_->CreateAndAppendItem<cc::EndTransformDisplayItem>();
81 } 87 }
82 88
83 void WebDisplayItemListImpl::appendCompositingItem( 89 void WebDisplayItemListImpl::appendCompositingItem(
84 float opacity, 90 float opacity,
85 SkXfermode::Mode xfermode, 91 SkXfermode::Mode xfermode,
86 SkRect* bounds, 92 SkRect* bounds,
87 SkColorFilter* color_filter) { 93 SkColorFilter* color_filter) {
88 DCHECK_GE(opacity, 0.f); 94 DCHECK_GE(opacity, 0.f);
89 DCHECK_LE(opacity, 1.f); 95 DCHECK_LE(opacity, 1.f);
90 // TODO(ajuma): This should really be rounding instead of flooring the alpha 96 // TODO(ajuma): This should really be rounding instead of flooring the alpha
91 // value, but that breaks slimming paint reftests. 97 // value, but that breaks slimming paint reftests.
92 display_item_list_->AppendItem(cc::CompositingDisplayItem::Create( 98 auto* item =
93 static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)), xfermode, bounds, 99 display_item_list_->CreateAndAppendItem<cc::CompositingDisplayItem>();
94 skia::SharePtr(color_filter))); 100 item->SetNew(static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)), xfermode,
101 bounds, skia::SharePtr(color_filter));
95 } 102 }
96 103
97 void WebDisplayItemListImpl::appendEndCompositingItem() { 104 void WebDisplayItemListImpl::appendEndCompositingItem() {
98 display_item_list_->AppendItem(cc::EndCompositingDisplayItem::Create()); 105 display_item_list_->CreateAndAppendItem<cc::EndCompositingDisplayItem>();
99 } 106 }
100 107
101 void WebDisplayItemListImpl::appendFilterItem( 108 void WebDisplayItemListImpl::appendFilterItem(
102 const blink::WebFilterOperations& filters, 109 const blink::WebFilterOperations& filters,
103 const blink::WebFloatRect& bounds) { 110 const blink::WebFloatRect& bounds) {
104 const WebFilterOperationsImpl& filters_impl = 111 const WebFilterOperationsImpl& filters_impl =
105 static_cast<const WebFilterOperationsImpl&>(filters); 112 static_cast<const WebFilterOperationsImpl&>(filters);
106 display_item_list_->AppendItem( 113 auto* item = display_item_list_->CreateAndAppendItem<cc::FilterDisplayItem>();
107 cc::FilterDisplayItem::Create(filters_impl.AsFilterOperations(), bounds)); 114 item->SetNew(filters_impl.AsFilterOperations(), bounds);
108 } 115 }
109 116
110 void WebDisplayItemListImpl::appendEndFilterItem() { 117 void WebDisplayItemListImpl::appendEndFilterItem() {
111 display_item_list_->AppendItem(cc::EndFilterDisplayItem::Create()); 118 display_item_list_->CreateAndAppendItem<cc::EndFilterDisplayItem>();
112 } 119 }
113 120
114 void WebDisplayItemListImpl::appendScrollItem( 121 void WebDisplayItemListImpl::appendScrollItem(
115 const blink::WebSize& scrollOffset, 122 const blink::WebSize& scrollOffset,
116 ScrollContainerId) { 123 ScrollContainerId) {
117 SkMatrix44 matrix; 124 SkMatrix44 matrix;
118 matrix.setTranslate(-scrollOffset.width, -scrollOffset.height, 0); 125 matrix.setTranslate(-scrollOffset.width, -scrollOffset.height, 0);
119 appendTransformItem(matrix); 126 appendTransformItem(matrix);
120 } 127 }
121 128
122 void WebDisplayItemListImpl::appendEndScrollItem() { 129 void WebDisplayItemListImpl::appendEndScrollItem() {
123 appendEndTransformItem(); 130 appendEndTransformItem();
124 } 131 }
125 132
126 WebDisplayItemListImpl::~WebDisplayItemListImpl() { 133 WebDisplayItemListImpl::~WebDisplayItemListImpl() {
127 } 134 }
128 135
129 } // namespace cc_blink 136 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/BUILD.gn ('k') | cc/cc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698