| Index: cc/playback/compositing_display_item.cc
|
| diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc
|
| index 2d8197d030fdc273b2e9529a4a3d1903984ea8dc..e2eab3b005dc56e799c223a18e0b51a8734e54e7 100644
|
| --- a/cc/playback/compositing_display_item.cc
|
| +++ b/cc/playback/compositing_display_item.cc
|
| @@ -27,13 +27,14 @@ CompositingDisplayItem::CompositingDisplayItem(
|
| SkBlendMode xfermode,
|
| SkRect* bounds,
|
| sk_sp<SkColorFilter> cf,
|
| - bool lcd_text_requires_opaque_layer) {
|
| + bool lcd_text_requires_opaque_layer)
|
| + : DisplayItem(COMPOSITING) {
|
| SetNew(alpha, xfermode, bounds, std::move(cf),
|
| lcd_text_requires_opaque_layer);
|
| }
|
|
|
| -CompositingDisplayItem::CompositingDisplayItem(
|
| - const proto::DisplayItem& proto) {
|
| +CompositingDisplayItem::CompositingDisplayItem(const proto::DisplayItem& proto)
|
| + : DisplayItem(COMPOSITING) {
|
| DCHECK_EQ(proto::DisplayItem::Type_Compositing, proto.type());
|
|
|
| const proto::CompositingDisplayItem& details = proto.compositing_item();
|
| @@ -124,15 +125,12 @@ void CompositingDisplayItem::AsValueInto(
|
| array->AppendString(info);
|
| }
|
|
|
| -size_t CompositingDisplayItem::ExternalMemoryUsage() const {
|
| - // TODO(pdr): Include color_filter's memory here.
|
| - return 0;
|
| -}
|
| -
|
| -EndCompositingDisplayItem::EndCompositingDisplayItem() {}
|
| +EndCompositingDisplayItem::EndCompositingDisplayItem()
|
| + : DisplayItem(END_COMPOSITING) {}
|
|
|
| EndCompositingDisplayItem::EndCompositingDisplayItem(
|
| - const proto::DisplayItem& proto) {
|
| + const proto::DisplayItem& proto)
|
| + : DisplayItem(END_COMPOSITING) {
|
| DCHECK_EQ(proto::DisplayItem::Type_EndCompositing, proto.type());
|
| }
|
|
|
| @@ -157,8 +155,4 @@ void EndCompositingDisplayItem::AsValueInto(
|
| visual_rect.ToString().c_str()));
|
| }
|
|
|
| -size_t EndCompositingDisplayItem::ExternalMemoryUsage() const {
|
| - return 0;
|
| -}
|
| -
|
| } // namespace cc
|
|
|