Add protobuf serialization to DisplayItemList

cc/playback/filter_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/filter_display_item.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/output/render_surface_filters.h"
+#include "cc/proto/display_item.pb.h"
+#include "cc/proto/gfx_conversions.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 FilterDisplayItem::FilterDisplayItem() {
 }
 
 FilterDisplayItem::~FilterDisplayItem() {
 }
 
 void FilterDisplayItem::SetNew(const FilterOperations& filters,
                                const gfx::RectF& bounds) {
   filters_ = filters;
   bounds_ = bounds;
 
   // FilterOperations doesn't expose its capacity, but size is probably good
   // enough.
   size_t external_memory_usage = filters_.size() * sizeof(filters_.at(0));
   DisplayItem::SetNew(true /* suitable_for_gpu_raster */, 1 /* op_count */,
                       external_memory_usage);
 }
 
+void FilterDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
+  proto->set_type(proto::DisplayItem::Type_Filter);
+
+  proto::FilterDisplayItem* details = proto->mutable_filter_item();
+  RectFToProto(bounds_, details->mutable_bounds());
+
+  // TODO(dtrainor): Support serializing FilterOperations.

[vmpstr, 2015/10/27 21:49:47]

Bug number please :)

[David Trainor- moved to gerrit, 2015/10/27 22:49:24]

Done.

+}
+
+void FilterDisplayItem::FromProtobuf(const proto::DisplayItem& proto) {
+  DCHECK_EQ(proto::DisplayItem::Type_Filter, proto.type());
+
+  const proto::FilterDisplayItem& details = proto.filter_item();
+  gfx::RectF bounds = ProtoToRectF(details.bounds());
+
+  // TODO(dtrainor): Support deserializing FilterOperations.
+  FilterOperations filters;
+
+  SetNew(filters, bounds);
+}
+
 void FilterDisplayItem::Raster(SkCanvas* canvas,
                                const gfx::Rect& canvas_target_playback_rect,
                                SkPicture::AbortCallback* callback) const {
   canvas->save();
   canvas->translate(bounds_.x(), bounds_.y());
 
   skia::RefPtr<SkImageFilter> image_filter =
       RenderSurfaceFilters::BuildImageFilter(
           filters_, gfx::SizeF(bounds_.width(), bounds_.height()));
 #ifdef SK_SAVE_LAYER_BOUNDS_ARE_FILTERED
@@ skipping 20 matching lines @@
 }
 
 EndFilterDisplayItem::EndFilterDisplayItem() {
   DisplayItem::SetNew(true /* suitable_for_gpu_raster */, 0 /* op_count */,
                       0 /* external_memory_usage */);
 }
 
 EndFilterDisplayItem::~EndFilterDisplayItem() {
 }
 
+void EndFilterDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
+  proto->set_type(proto::DisplayItem::Type_EndFilter);
+}
+
+void EndFilterDisplayItem::FromProtobuf(const proto::DisplayItem& proto) {
+  DCHECK_EQ(proto::DisplayItem::Type_EndFilter, proto.type());
+}
+
 void EndFilterDisplayItem::Raster(SkCanvas* canvas,
                                   const gfx::Rect& canvas_target_playback_rect,
                                   SkPicture::AbortCallback* callback) const {
   canvas->restore();
   canvas->restore();
 }
 
 void EndFilterDisplayItem::AsValueInto(
     base::trace_event::TracedValue* array) const {
   array->AppendString("EndFilterDisplayItem");
 }
 
 }  // namespace cc