Update from https://crrev.com/314320

cc/resources/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/resources/drawing_display_item.h"
 
+#include <string>
+
 #include "base/logging.h"
+#include "base/strings/stringprintf.h"
+#include "base/trace_event/trace_event_argument.h"
+#include "cc/debug/picture_debug_util.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDrawPictureCallback.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/utils/SkPictureUtils.h"
 
 namespace cc {
 
 DrawingDisplayItem::DrawingDisplayItem(skia::RefPtr<SkPicture> picture,
                                        gfx::PointF location)
@@ skipping 32 matching lines @@
 
 int DrawingDisplayItem::ApproximateOpCount() const {
   return picture_->approximateOpCount() + sizeof(gfx::PointF);
 }
 
 size_t DrawingDisplayItem::PictureMemoryUsage() const {
   DCHECK(picture_);
   return SkPictureUtils::ApproximateBytesUsed(picture_.get());
 }
 
+void DrawingDisplayItem::AsValueInto(base::debug::TracedValue* array) const {
+  array->BeginDictionary();
+  array->SetString("name", "DrawingDisplayItem");
+  array->SetString("location",
+                   base::StringPrintf("[%f,%f]", picture_->cullRect().x(),
+                                      picture_->cullRect().y()));
+  std::string b64_picture;
+  PictureDebugUtil::SerializeAsBase64(picture_.get(), &b64_picture);
+  array->SetString("skp64", b64_picture);
+  array->EndDictionary();
+}
+
 }  // namespace cc