Revert of cc: Shrink size of display item

cc/playback/compositing_display_item.h

Index: cc/playback/compositing_display_item.h
diff --git a/cc/playback/compositing_display_item.h b/cc/playback/compositing_display_item.h
index 95121895f00c5e8718cfe16ca8456111e66c515d..071308ec018908022f3f70992500b7411447848c 100644
--- a/cc/playback/compositing_display_item.h
+++ b/cc/playback/compositing_display_item.h
@@ -20,30 +20,23 @@
 
 class CC_EXPORT CompositingDisplayItem : public DisplayItem {
  public:
-  CompositingDisplayItem(uint8_t alpha,
-                         SkXfermode::Mode xfermode,
-                         SkRect* bounds,
-                         skia::RefPtr<SkColorFilter> color_filter);
-  explicit CompositingDisplayItem(const proto::DisplayItem& proto);
+  CompositingDisplayItem();
   ~CompositingDisplayItem() override;
 
+  void SetNew(uint8_t alpha,
+              SkXfermode::Mode xfermode,
+              SkRect* bounds,
+              skia::RefPtr<SkColorFilter> color_filter);
+
   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(uint8_t alpha,
-              SkXfermode::Mode xfermode,
-              SkRect* bounds,
-              skia::RefPtr<SkColorFilter> color_filter);
-
   uint8_t alpha_;
   SkXfermode::Mode xfermode_;
   bool has_bounds_;
@@ -54,7 +47,6 @@
 class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
  public:
   EndCompositingDisplayItem();
-  explicit EndCompositingDisplayItem(const proto::DisplayItem& proto);
   ~EndCompositingDisplayItem() override;
 
   static scoped_ptr<EndCompositingDisplayItem> Create() {
@@ -62,15 +54,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