cc: Shrink size of display item

cc/playback/drawing_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/drawing_display_item.h"
 
 #include <string>
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/debug/picture_debug_util.h"
 #include "cc/proto/display_item.pb.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/utils/SkPictureUtils.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
-DrawingDisplayItem::DrawingDisplayItem() {
+DrawingDisplayItem::DrawingDisplayItem() {}
+
+DrawingDisplayItem::DrawingDisplayItem(skia::RefPtr<SkPicture> picture) {
+  SetNew(picture);

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

prefer to move() the reference when it makes sense like here

+}
+
+DrawingDisplayItem::DrawingDisplayItem(const proto::DisplayItem& proto) {
+  FromProtobuf(proto);
+}
+
+DrawingDisplayItem::DrawingDisplayItem(const DrawingDisplayItem& item) {
+  item.CloneTo(this);
 }
 
 DrawingDisplayItem::~DrawingDisplayItem() {
 }
 
 void DrawingDisplayItem::SetNew(skia::RefPtr<SkPicture> picture) {
-  picture_ = std::move(picture);
-  DisplayItem::SetNew(picture_->suitableForGpuRasterization(NULL),
-                      picture_->approximateOpCount(),
-                      SkPictureUtils::ApproximateBytesUsed(picture_.get()));
+  picture_ = picture;

[vmpstr, 2015/12/08 19:07:02]

Still move to save on refcounts?

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

ditto

 }
 
 void DrawingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   proto->set_type(proto::DisplayItem::Type_Drawing);
 
   proto::DrawingDisplayItem* details = proto->mutable_drawing_item();
 
   // Just use skia's serialize() method for now.
   if (picture_) {
     SkDynamicMemoryWStream stream;
@@ skipping 67 matching lines @@
   std::string b64_picture;
   PictureDebugUtil::SerializeAsBase64(picture_.get(), &b64_picture);
   array->SetString("skp64", b64_picture);
   array->EndDictionary();
 }
 
 void DrawingDisplayItem::CloneTo(DrawingDisplayItem* item) const {
   item->SetNew(picture_);
 }
 
+size_t DrawingDisplayItem::ExternalMemoryUsage() const {
+  return SkPictureUtils::ApproximateBytesUsed(picture_.get());
+}
+
+int DrawingDisplayItem::ApproximateOpCount() const {
+  return picture_->approximateOpCount();
+}
+
+bool DrawingDisplayItem::IsSuitableForGpuRasterization() const {
+  return picture_->suitableForGpuRasterization(NULL);
+}
+
 }  // namespace cc