diff options
author | jbroman <jbroman@chromium.org> | 2015-05-29 13:11:59 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-29 20:12:24 +0000 |
commit | 16d628c67c862bf12797dc98a4a4110cf7b3229b (patch) | |
tree | c58b1c8f1d37497fda5cbc507b1954f8597a39fe /cc/trees/layer_tree_host_unittest.cc | |
parent | dca49897b2a0938dab1811f1072a1196bbba2854 (diff) | |
download | chromium_src-16d628c67c862bf12797dc98a4a4110cf7b3229b.zip chromium_src-16d628c67c862bf12797dc98a4a4110cf7b3229b.tar.gz chromium_src-16d628c67c862bf12797dc98a4a4110cf7b3229b.tar.bz2 |
cc: Make ContentLayerClient subclasses create the DisplayItemList.
The clients are now expected to return a cc::DisplayItemList which is
suitably "finalized" (in particular, ProcessAppendedItems and
CreateAndCacheSkPicture should have been called, as appropriate for the
settings used to create the display list).
This avoids plumbing constructor parameters for DisplayItemList, which I'm
about to add more of.
BUG=484943
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1152283010
Cr-Commit-Position: refs/heads/master@{#332034}
Diffstat (limited to 'cc/trees/layer_tree_host_unittest.cc')
-rw-r--r-- | cc/trees/layer_tree_host_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index 53de149..808fb93 100644 --- a/cc/trees/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc @@ -1379,11 +1379,11 @@ class TestOpacityChangeLayerDelegate : public ContentLayerClient { if (test_layer_) test_layer_->SetOpacity(0.f); } - void PaintContentsToDisplayList( - DisplayItemList* display_list, + scoped_refptr<DisplayItemList> PaintContentsToDisplayList( const gfx::Rect& clip, PaintingControlSetting picture_control) override { NOTIMPLEMENTED(); + return nullptr; } bool FillsBoundsCompletely() const override { return false; } @@ -2946,11 +2946,11 @@ class LayerTreeHostTestChangeLayerPropertiesInPaintContents layer_->SetBounds(gfx::Size(2, 2)); } - void PaintContentsToDisplayList( - DisplayItemList* display_list, + scoped_refptr<DisplayItemList> PaintContentsToDisplayList( const gfx::Rect& clip, PaintingControlSetting picture_control) override { NOTIMPLEMENTED(); + return nullptr; } bool FillsBoundsCompletely() const override { return false; } |