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

cc/paint/discardable_image_map.h

Index: cc/paint/discardable_image_map.h
diff --git a/cc/playback/discardable_image_map.h b/cc/paint/discardable_image_map.h
similarity index 85%
rename from cc/playback/discardable_image_map.h
rename to cc/paint/discardable_image_map.h
index abbf08bc0e7a52b4e767c96ccfbf280f2a5e9443..57594b2da352a4660338507200b54579b97db67c 100644
--- a/cc/playback/discardable_image_map.h
+++ b/cc/paint/discardable_image_map.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_PLAYBACK_DISCARDABLE_IMAGE_MAP_H_
-#define CC_PLAYBACK_DISCARDABLE_IMAGE_MAP_H_
+#ifndef CC_PAINT_DISCARDABLE_IMAGE_MAP_H_
+#define CC_PAINT_DISCARDABLE_IMAGE_MAP_H_
 
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "cc/base/cc_export.h"
 #include "cc/base/rtree.h"
-#include "cc/playback/draw_image.h"
-#include "cc/playback/image_id.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/SkCanvas.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/geometry/rect.h"
@@ -26,9 +26,9 @@ SkRect MapRect(const SkMatrix& matrix, const SkRect& src);
 // This class is used for generating discardable images data (see DrawImage
 // for the type of data it stores). It allows the client to query a particular
 // rect and get back a list of DrawImages in that rect.
-class CC_EXPORT DiscardableImageMap {
+class CC_PAINT_EXPORT DiscardableImageMap {
  public:
-  class CC_EXPORT ScopedMetadataGenerator {
+  class CC_PAINT_EXPORT ScopedMetadataGenerator {
    public:
     ScopedMetadataGenerator(DiscardableImageMap* image_map,
                             const gfx::Size& bounds);
@@ -65,4 +65,4 @@ class CC_EXPORT DiscardableImageMap {
 
 }  // namespace cc
 
-#endif  // CC_PLAYBACK_DISCARDABLE_IMAGE_MAP_H_
+#endif  // CC_PAINT_DISCARDABLE_IMAGE_MAP_H_