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

cc/raster/image_hijack_canvas.h

 // Copyright 2016 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_IMAGE_HIJACK_CANVAS_H_
-#define CC_PLAYBACK_IMAGE_HIJACK_CANVAS_H_
+#ifndef CC_RASTER_IMAGE_HIJACK_CANVAS_H_
+#define CC_RASTER_IMAGE_HIJACK_CANVAS_H_
 
 #include <unordered_set>
 
 #include "base/macros.h"
-#include "cc/base/cc_export.h"
-#include "cc/playback/image_id.h"
+#include "cc/cc_export.h"
+#include "cc/paint/image_id.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 
 namespace cc {
 
 class ImageDecodeCache;
 
 class CC_EXPORT ImageHijackCanvas : public SkNWayCanvas {
  public:
   ImageHijackCanvas(int width,
                     int height,
@@ skipping 33 matching lines @@
   bool ShouldSkipImageInPaint(const SkPaint& paint) const;
 
   ImageDecodeCache* image_decode_cache_;
   const ImageIdFlatSet* images_to_skip_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageHijackCanvas);
 };
 
 }  // namespace cc
 
-#endif  // CC_PLAYBACK_IMAGE_HIJACK_CANVAS_H_
+#endif  // CC_RASTER_IMAGE_HIJACK_CANVAS_H_