Revert of cc: Shrink size of display item

cc/playback/clip_path_display_item.h

Index: cc/playback/clip_path_display_item.h
diff --git a/cc/playback/clip_path_display_item.h b/cc/playback/clip_path_display_item.h
index f3eaa0abb26ad6ba578fc6909c3c730f968ddda1..6f37ebea7f0fc92eba08a5c446ad8e75b65f54c8 100644
--- a/cc/playback/clip_path_display_item.h
+++ b/cc/playback/clip_path_display_item.h
@@ -17,24 +17,20 @@
 
 class CC_EXPORT ClipPathDisplayItem : public DisplayItem {
  public:
-  ClipPathDisplayItem(const SkPath& path, SkRegion::Op clip_op, bool antialias);
-  explicit ClipPathDisplayItem(const proto::DisplayItem& proto);
+  ClipPathDisplayItem();
   ~ClipPathDisplayItem() override;
 
+  void SetNew(const SkPath& path, SkRegion::Op clip_op, bool antialias);
+
   void ToProtobuf(proto::DisplayItem* proto) const override;
+  void FromProtobuf(const proto::DisplayItem& proto) override;
   void Raster(SkCanvas* canvas,
               const gfx::Rect& canvas_target_playback_rect,
               SkPicture::AbortCallback* callback) const override;
   void AsValueInto(const gfx::Rect& visual_rect,
                    base::trace_event::TracedValue* array) const override;
-  size_t ExternalMemoryUsage() const override;
-
-  int ApproximateOpCount() const { return 1; }
-  bool IsSuitableForGpuRasterization() const { return true; }
 
  private:
-  void SetNew(const SkPath& path, SkRegion::Op clip_op, bool antialias);
-
   SkPath clip_path_;
   SkRegion::Op clip_op_;
   bool antialias_;
@@ -43,7 +39,6 @@
 class CC_EXPORT EndClipPathDisplayItem : public DisplayItem {
  public:
   EndClipPathDisplayItem();
-  explicit EndClipPathDisplayItem(const proto::DisplayItem& proto);
   ~EndClipPathDisplayItem() override;
 
   static scoped_ptr<EndClipPathDisplayItem> Create() {
@@ -51,15 +46,12 @@
   }
 
   void ToProtobuf(proto::DisplayItem* proto) const override;
+  void FromProtobuf(const proto::DisplayItem& proto) override;
   void Raster(SkCanvas* canvas,
               const gfx::Rect& canvas_target_playback_rect,
               SkPicture::AbortCallback* callback) const override;
   void AsValueInto(const gfx::Rect& visual_rect,
                    base::trace_event::TracedValue* array) const override;
-  size_t ExternalMemoryUsage() const override;
-
-  int ApproximateOpCount() const { return 0; }
-  bool IsSuitableForGpuRasterization() const { return true; }
 };
 
 }  // namespace cc