| Index: cc/resources/display_item_list.h
|
| diff --git a/cc/resources/display_item_list.h b/cc/resources/display_item_list.h
|
| index 0a5d468f0fed171de5f12a9a6985c228e2dbd007..f49055209d79fa762392547cb6d1cd3c547b96b1 100644
|
| --- a/cc/resources/display_item_list.h
|
| +++ b/cc/resources/display_item_list.h
|
| @@ -18,15 +18,13 @@
|
|
|
| class SkCanvas;
|
| class SkDrawPictureCallback;
|
| -class SkPictureRecorder;
|
|
|
| namespace cc {
|
|
|
| class CC_EXPORT DisplayItemList
|
| : public base::RefCountedThreadSafe<DisplayItemList> {
|
| public:
|
| - static scoped_refptr<DisplayItemList> Create(gfx::Rect layer_rect,
|
| - bool use_cached_picture);
|
| + static scoped_refptr<DisplayItemList> Create();
|
|
|
| void Raster(SkCanvas* canvas,
|
| SkDrawPictureCallback* callback,
|
| @@ -34,6 +32,9 @@ class CC_EXPORT DisplayItemList
|
|
|
| void AppendItem(scoped_ptr<DisplayItem> item);
|
|
|
| + void set_layer_rect(gfx::Rect layer_rect) { layer_rect_ = layer_rect; }
|
| + gfx::Rect layer_rect() const { return layer_rect_; }
|
| +
|
| void CreateAndCacheSkPicture();
|
|
|
| bool IsSuitableForGpuRasterization() const;
|
| @@ -47,16 +48,11 @@ class CC_EXPORT DisplayItemList
|
| void GatherPixelRefs(const gfx::Size& grid_cell_size);
|
|
|
| private:
|
| - DisplayItemList(gfx::Rect layer_rect, bool use_cached_picture);
|
| + DisplayItemList();
|
| ~DisplayItemList();
|
| ScopedPtrVector<DisplayItem> items_;
|
| skia::RefPtr<SkPicture> picture_;
|
|
|
| - scoped_ptr<SkPictureRecorder> recorder_;
|
| - skia::RefPtr<SkCanvas> canvas_;
|
| - bool use_cached_picture_;
|
| - bool retain_individual_display_items_;
|
| -
|
| gfx::Rect layer_rect_;
|
| bool is_suitable_for_gpu_rasterization_;
|
| int approximate_op_count_;
|
|
|