Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: cc/resources/display_item_list.h

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/display_item.cc ('k') | cc/resources/display_item_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « cc/resources/display_item.cc ('k') | cc/resources/display_item_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698