cc: Remove AsValue virtual from DisplayItem.

cc/playback/display_item_list.h

 // 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.
 
 #ifndef CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
 #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/contiguous_container.h"
 #include "cc/base/rtree.h"
 #include "cc/playback/discardable_image_map.h"
 #include "cc/playback/display_item.h"
 #include "cc/playback/image_id.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/color_space.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 class SkCanvas;
 
+namespace base {
+namespace trace_event {
+class TracedValue;
+}
+}
+
 namespace cc {
 class DisplayItem;
 
 class CC_EXPORT DisplayItemList
     : public base::RefCountedThreadSafe<DisplayItemList> {
  public:
   DisplayItemList();
 
   // TODO(trchen): Deprecated. Apply clip and scale on the canvas instead.
   void Raster(SkCanvas* canvas,
@@ skipping 83 matching lines @@
 
   void SetIsSuitableForGpuRasterization(bool is_suitable) {
     inputs_.all_items_are_suitable_for_gpu_rasterization = is_suitable;
   }
   bool IsSuitableForGpuRasterization() const;
 
   int ApproximateOpCount() const;
   size_t ApproximateMemoryUsage() const;
   bool ShouldBeAnalyzedForSolidColor() const;
 
-  std::unique_ptr<base::trace_event::ConvertableToTraceFormat> AsValue(
-      bool include_items) const;
-
   void EmitTraceSnapshot() const;
 
   void GenerateDiscardableImagesMetadata();
   void GetDiscardableImagesInRect(const gfx::Rect& rect,
                                   float contents_scale,
                                   std::vector<DrawImage>* images);
   gfx::Rect GetRectForImage(ImageId image_id) const;
 
   void SetRetainVisualRectsForTesting(bool retain) {
     retain_visual_rects_ = retain;
   }
 
   size_t size() const { return inputs_.items.size(); }
 
   gfx::Rect VisualRectForTesting(int index) {
     return inputs_.visual_rects[index];
   }
 
   ContiguousContainer<DisplayItem>::const_iterator begin() const {
     return inputs_.items.begin();
   }
 
   ContiguousContainer<DisplayItem>::const_iterator end() const {
     return inputs_.items.end();
   }
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, AsValueWithNoItems);
+  FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, AsValueWithItems);
+
   ~DisplayItemList();
 
+  std::unique_ptr<base::trace_event::TracedValue> CreateTracedValue(
+      bool include_items) const;
+
   RTree rtree_;
   // For testing purposes only. Whether to keep visual rects across calls to
   // Finalize().
   bool retain_visual_rects_ = false;
 
   // If we're currently within a paired display item block, unions the
   // given visual rect with the begin display item's visual rect.
   void GrowCurrentBeginItemVisualRect(const gfx::Rect& visual_rect);
 
   template <typename DisplayItemType, typename... Args>
@@ skipping 26 matching lines @@
   Inputs inputs_;
 
   friend class base::RefCountedThreadSafe<DisplayItemList>;
   FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, ApproximateMemoryUsage);
   DISALLOW_COPY_AND_ASSIGN(DisplayItemList);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_DISPLAY_ITEM_LIST_H_