| Index: cc/paint/display_item_list.h
|
| diff --git a/cc/playback/display_item_list.h b/cc/paint/display_item_list.h
|
| similarity index 95%
|
| rename from cc/playback/display_item_list.h
|
| rename to cc/paint/display_item_list.h
|
| index 165f89c3e7c97f45bd0df0a267c63478324a2cd4..bad3241f65944600db3a9f211a3819a34eb4bc4e 100644
|
| --- a/cc/playback/display_item_list.h
|
| +++ b/cc/paint/display_item_list.h
|
| @@ -2,8 +2,8 @@
|
| // 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>
|
|
|
| @@ -14,12 +14,13 @@
|
| #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"
|
| @@ -36,7 +37,7 @@ class TracedValue;
|
| namespace cc {
|
| class DisplayItem;
|
|
|
| -class CC_EXPORT DisplayItemList
|
| +class CC_PAINT_EXPORT DisplayItemList
|
| : public base::RefCountedThreadSafe<DisplayItemList> {
|
| public:
|
| DisplayItemList();
|
| @@ -49,7 +50,6 @@ class CC_EXPORT DisplayItemList
|
|
|
| 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.
|
| @@ -216,4 +216,4 @@ class CC_EXPORT DisplayItemList
|
|
|
| } // namespace cc
|
|
|
| -#endif // CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
|
| +#endif // CC_PAINT_DISPLAY_ITEM_LIST_H_
|
|
|