Move cc::DisplayItemList and related classes into cc/paint/

cc/paint/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_
+#ifndef CC_PAINT_DISPLAY_ITEM_LIST_H_
+#define CC_PAINT_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 "cc/paint/discardable_image_map.h"
+#include "cc/paint/display_item.h"
+#include "cc/paint/draw_image.h"
+#include "cc/paint/image_id.h"
+#include "cc/paint/paint_export.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
+class CC_PAINT_EXPORT DisplayItemList
     : public base::RefCountedThreadSafe<DisplayItemList> {
  public:
   DisplayItemList();
 
   // TODO(trchen): Deprecated. Apply clip and scale on the canvas instead.
   void Raster(SkCanvas* canvas,
               SkPicture::AbortCallback* callback,
               const gfx::Rect& canvas_target_playback_rect,
               float contents_scale) const;
 
   void Raster(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
 
-
   // Because processing happens in these CreateAndAppend functions, all the set
   // up for the item should be done via the args, which is why the return type
   // needs to be const, to prevent set-after-processing mistakes.
 
   // Most paired begin item types default to an empty visual rect, which will
   // subsequently be grown as needed to encompass any contained items that draw
   // content, such as drawing or filter items.
   template <typename DisplayItemType, typename... Args>
   const DisplayItemType& CreateAndAppendPairedBeginItem(Args&&... args) {
     return CreateAndAppendPairedBeginItemWithVisualRect<DisplayItemType>(
@@ skipping 146 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_
+#endif  // CC_PAINT_DISPLAY_ITEM_LIST_H_