Revert of cc: Shrink size of display item

cc/playback/clip_path_display_item.cc

Index: cc/playback/clip_path_display_item.cc
diff --git a/cc/playback/clip_path_display_item.cc b/cc/playback/clip_path_display_item.cc
index 5b9b3f20d2a8ceb31ab04c5a2eddbfd53d3c6dbe..2168ee1f9cd8a2c1cea4c604382477ac9684a19b 100644
--- a/cc/playback/clip_path_display_item.cc
+++ b/cc/playback/clip_path_display_item.cc
@@ -12,27 +12,7 @@
 
 namespace cc {
 
-ClipPathDisplayItem::ClipPathDisplayItem(const SkPath& clip_path,
-                                         SkRegion::Op clip_op,
-                                         bool antialias) {
-  SetNew(clip_path, clip_op, antialias);
-}
-
-ClipPathDisplayItem::ClipPathDisplayItem(const proto::DisplayItem& proto) {
-  DCHECK_EQ(proto::DisplayItem::Type_ClipPath, proto.type());
-
-  const proto::ClipPathDisplayItem& details = proto.clip_path_item();
-  SkRegion::Op clip_op = SkRegionOpFromProto(details.clip_op());
-  bool antialias = details.antialias();
-
-  SkPath clip_path;
-  if (details.has_clip_path()) {
-    size_t bytes_read = clip_path.readFromMemory(details.clip_path().data(),
-                                                 details.clip_path().size());
-    DCHECK_EQ(details.clip_path().size(), bytes_read);
-  }
-
-  SetNew(clip_path, clip_op, antialias);
+ClipPathDisplayItem::ClipPathDisplayItem() {
 }
 
 ClipPathDisplayItem::~ClipPathDisplayItem() {
@@ -44,6 +24,11 @@
   clip_path_ = clip_path;
   clip_op_ = clip_op;
   antialias_ = antialias;
+
+  // The size of SkPath's external storage is not currently accounted for (and
+  // may well be shared anyway).
+  DisplayItem::SetNew(true /* suitable_for_gpu_raster */, 1 /* op_count */,
+                      0 /* external_memory_usage */);
 }
 
 void ClipPathDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
@@ -62,6 +47,23 @@
   }
 }
 
+void ClipPathDisplayItem::FromProtobuf(const proto::DisplayItem& proto) {
+  DCHECK_EQ(proto::DisplayItem::Type_ClipPath, proto.type());
+
+  const proto::ClipPathDisplayItem& details = proto.clip_path_item();
+  SkRegion::Op clip_op = SkRegionOpFromProto(details.clip_op());
+  bool antialias = details.antialias();
+
+  SkPath clip_path;
+  if (details.has_clip_path()) {
+    size_t bytes_read = clip_path.readFromMemory(details.clip_path().data(),
+                                                 details.clip_path().size());
+    DCHECK_EQ(details.clip_path().size(), bytes_read);
+  }
+
+  SetNew(clip_path, clip_op, antialias);
+}
+
 void ClipPathDisplayItem::Raster(SkCanvas* canvas,
                                  const gfx::Rect& canvas_target_playback_rect,
                                  SkPicture::AbortCallback* callback) const {
@@ -77,17 +79,9 @@
       clip_path_.countPoints(), visual_rect.ToString().c_str()));
 }
 
-size_t ClipPathDisplayItem::ExternalMemoryUsage() const {
-  // The size of SkPath's external storage is not currently accounted for (and
-  // may well be shared anyway).
-  return 0;
-}
-
-EndClipPathDisplayItem::EndClipPathDisplayItem() {}
-
-EndClipPathDisplayItem::EndClipPathDisplayItem(
-    const proto::DisplayItem& proto) {
-  DCHECK_EQ(proto::DisplayItem::Type_EndClipPath, proto.type());
+EndClipPathDisplayItem::EndClipPathDisplayItem() {
+  DisplayItem::SetNew(true /* suitable_for_gpu_raster */, 0 /* op_count */,
+                      0 /* external_memory_usage */);
 }
 
 EndClipPathDisplayItem::~EndClipPathDisplayItem() {
@@ -95,6 +89,10 @@
 
 void EndClipPathDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   proto->set_type(proto::DisplayItem::Type_EndClipPath);
+}
+
+void EndClipPathDisplayItem::FromProtobuf(const proto::DisplayItem& proto) {
+  DCHECK_EQ(proto::DisplayItem::Type_EndClipPath, proto.type());
 }
 
 void EndClipPathDisplayItem::Raster(
@@ -112,8 +110,4 @@
                          visual_rect.ToString().c_str()));
 }
 
-size_t EndClipPathDisplayItem::ExternalMemoryUsage() const {
-  return 0;
-}
-
 }  // namespace cc