Revert of cc: Shrink size of display item

cc/playback/clip_display_item.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/playback/clip_display_item.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/skia_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
-ClipDisplayItem::ClipDisplayItem(
-    const gfx::Rect& clip_rect,
-    const std::vector<SkRRect>& rounded_clip_rects) {
-  SetNew(clip_rect, rounded_clip_rects);
+ClipDisplayItem::ClipDisplayItem() {
 }
 
-ClipDisplayItem::ClipDisplayItem(const proto::DisplayItem& proto) {
+ClipDisplayItem::~ClipDisplayItem() {
+}
+
+void ClipDisplayItem::SetNew(gfx::Rect clip_rect,
+                             const std::vector<SkRRect>& rounded_clip_rects) {
+  clip_rect_ = clip_rect;
+  rounded_clip_rects_ = rounded_clip_rects;
+
+  size_t external_memory_usage =
+      rounded_clip_rects_.capacity() * sizeof(rounded_clip_rects_[0]);
+
+  DisplayItem::SetNew(true /* suitable_for_gpu_raster */, 1 /* op_count */,
+                      external_memory_usage);
+}
+
+void ClipDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
+  proto->set_type(proto::DisplayItem::Type_Clip);
+
+  proto::ClipDisplayItem* details = proto->mutable_clip_item();
+  RectToProto(clip_rect_, details->mutable_clip_rect());
+  DCHECK_EQ(0, details->rounded_rects_size());
+  for (const auto& rrect : rounded_clip_rects_) {
+    SkRRectToProto(rrect, details->add_rounded_rects());
+  }
+}
+
+void ClipDisplayItem::FromProtobuf(const proto::DisplayItem& proto) {
   DCHECK_EQ(proto::DisplayItem::Type_Clip, proto.type());
 
   const proto::ClipDisplayItem& details = proto.clip_item();
   gfx::Rect clip_rect = ProtoToRect(details.clip_rect());
   std::vector<SkRRect> rounded_clip_rects;
   rounded_clip_rects.reserve(details.rounded_rects_size());
   for (int i = 0; i < details.rounded_rects_size(); i++) {
     rounded_clip_rects.push_back(ProtoToSkRRect(details.rounded_rects(i)));
   }
   SetNew(clip_rect, rounded_clip_rects);
 }
 
-void ClipDisplayItem::SetNew(const gfx::Rect& clip_rect,
-                             const std::vector<SkRRect>& rounded_clip_rects) {
-  clip_rect_ = clip_rect;
-  rounded_clip_rects_ = rounded_clip_rects;
-}
-
-ClipDisplayItem::~ClipDisplayItem() {}
-
-void ClipDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
-  proto->set_type(proto::DisplayItem::Type_Clip);
-
-  proto::ClipDisplayItem* details = proto->mutable_clip_item();
-  RectToProto(clip_rect_, details->mutable_clip_rect());
-  DCHECK_EQ(0, details->rounded_rects_size());
-  for (const auto& rrect : rounded_clip_rects_) {
-    SkRRectToProto(rrect, details->add_rounded_rects());
-  }
-}
-
 void ClipDisplayItem::Raster(SkCanvas* canvas,
                              const gfx::Rect& canvas_target_playback_rect,
                              SkPicture::AbortCallback* callback) const {
   canvas->save();
   canvas->clipRect(SkRect::MakeXYWH(clip_rect_.x(), clip_rect_.y(),
                                     clip_rect_.width(), clip_rect_.height()));
   for (size_t i = 0; i < rounded_clip_rects_.size(); ++i) {
     if (rounded_clip_rects_[i].isRect()) {
       canvas->clipRect(rounded_clip_rects_[i].rect());
     } else {
@@ skipping 25 matching lines @@
         rounded_rect.radii(SkRRect::kLowerRight_Corner);
     base::StringAppendF(&value, " [%f,%f],", lower_right_radius.x(),
                         lower_right_radius.y());
     SkVector lower_left_radius = rounded_rect.radii(SkRRect::kLowerLeft_Corner);
     base::StringAppendF(&value, " [%f,%f]]", lower_left_radius.x(),
                         lower_left_radius.y());
   }
   array->AppendString(value);
 }
 
-size_t ClipDisplayItem::ExternalMemoryUsage() const {
-  return rounded_clip_rects_.capacity() * sizeof(rounded_clip_rects_[0]);
-}
-
-EndClipDisplayItem::EndClipDisplayItem() {}
-
-EndClipDisplayItem::EndClipDisplayItem(const proto::DisplayItem& proto) {
-  DCHECK_EQ(proto::DisplayItem::Type_EndClip, proto.type());
+EndClipDisplayItem::EndClipDisplayItem() {
+  DisplayItem::SetNew(true /* suitable_for_gpu_raster */, 0 /* op_count */,
+                      0 /* external_memory_usage */);
 }
 
 EndClipDisplayItem::~EndClipDisplayItem() {
 }
 
 void EndClipDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   proto->set_type(proto::DisplayItem::Type_EndClip);
 }
 
+void EndClipDisplayItem::FromProtobuf(const proto::DisplayItem& proto) {
+  DCHECK_EQ(proto::DisplayItem::Type_EndClip, proto.type());
+}
+
 void EndClipDisplayItem::Raster(SkCanvas* canvas,
                                 const gfx::Rect& canvas_target_playback_rect,
                                 SkPicture::AbortCallback* callback) const {
   canvas->restore();
 }
 
 void EndClipDisplayItem::AsValueInto(
     const gfx::Rect& visual_rect,
     base::trace_event::TracedValue* array) const {
   array->AppendString(base::StringPrintf("EndClipDisplayItem visualRect: [%s]",
                                          visual_rect.ToString().c_str()));
 }
 
-size_t EndClipDisplayItem::ExternalMemoryUsage() const {
-  return 0;
-}
-
 }  // namespace cc