cc: Shrink size of display item

cc/playback/compositing_display_item.cc

Index: cc/playback/compositing_display_item.cc
diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc
index 667371bafe6674db3b8d677417be8150838d5c3e..279eea89e4b8b2accd20ce2f31290d377a9a17b7 100644
--- a/cc/playback/compositing_display_item.cc
+++ b/cc/playback/compositing_display_item.cc
@@ -19,7 +19,16 @@
 
 namespace cc {
 
-CompositingDisplayItem::CompositingDisplayItem() {
+CompositingDisplayItem::CompositingDisplayItem(uint8_t alpha,
+                                               SkXfermode::Mode xfermode,
+                                               SkRect* bounds,
+                                               skia::RefPtr<SkColorFilter> cf) {
+  SetNew(alpha, xfermode, bounds, cf);

[danakj, 2015/12/08 19:18:14]

move cf

+}
+
+CompositingDisplayItem::CompositingDisplayItem(
+    const proto::DisplayItem& proto) {
+  FromProtobuf(proto);
 }
 
 CompositingDisplayItem::~CompositingDisplayItem() {
@@ -35,11 +44,6 @@ void CompositingDisplayItem::SetNew(uint8_t alpha,
   if (bounds)
     bounds_ = SkRect(*bounds);
   color_filter_ = cf;

[danakj, 2015/12/08 19:18:14]

this should move cf too while you're at it

-
-  // TODO(pdr): Include color_filter's memory here.
-  size_t external_memory_usage = 0;
-  DisplayItem::SetNew(true /* suitable_for_gpu_raster */, 1 /* op_count */,
-                      external_memory_usage);
 }
 
 void CompositingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
@@ -106,9 +110,16 @@ void CompositingDisplayItem::AsValueInto(
         static_cast<float>(bounds_.height())));
 }
 
-EndCompositingDisplayItem::EndCompositingDisplayItem() {
-  DisplayItem::SetNew(true /* suitable_for_gpu_raster */, 0 /* op_count */,
-                      0 /* external_memory_usage */);
+size_t CompositingDisplayItem::ExternalMemoryUsage() const {
+  // TODO(pdr): Include color_filter's memory here.
+  return 0;
+}
+
+EndCompositingDisplayItem::EndCompositingDisplayItem() {}
+
+EndCompositingDisplayItem::EndCompositingDisplayItem(
+    const proto::DisplayItem& proto) {
+  FromProtobuf(proto);
 }
 
 EndCompositingDisplayItem::~EndCompositingDisplayItem() {
@@ -137,4 +148,8 @@ void EndCompositingDisplayItem::AsValueInto(
                          visual_rect.ToString().c_str()));
 }
 
+size_t EndCompositingDisplayItem::ExternalMemoryUsage() const {
+  return 0;
+}
+
 }  // namespace cc