summaryrefslogtreecommitdiffstats
path: root/cc/layers/picture_layer.h
diff options
context:
space:
mode:
authorvmpstr <vmpstr@chromium.org>2014-10-28 11:38:10 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-28 18:38:33 +0000
commit394e2b51f40cbc5a522300073c7c058f95889901 (patch)
tree6e83162838676b83cfb35ad53f98e262051b93e5 /cc/layers/picture_layer.h
parent5c8274db40827d96b66493ac513b888cba152997 (diff)
downloadchromium_src-394e2b51f40cbc5a522300073c7c058f95889901.zip
chromium_src-394e2b51f40cbc5a522300073c7c058f95889901.tar.gz
chromium_src-394e2b51f40cbc5a522300073c7c058f95889901.tar.bz2
cc: Added raster source.
This patch adds a raster source that is an opaque interface for picture pile impl. It also removes the picture pile base ref count and adds it to the raster source. This makes it possible to use a member picture pile, instead of a ref pointer with one owner. What is missing here is the next step: removing picture pile base in favour of keeping shared data on the pile and copying it over. This should allow us to clean up the data and only share what is actually shared. R=danakj, enne, reveman Review URL: https://codereview.chromium.org/666273002 Cr-Commit-Position: refs/heads/master@{#301667}
Diffstat (limited to 'cc/layers/picture_layer.h')
-rw-r--r--cc/layers/picture_layer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/layers/picture_layer.h b/cc/layers/picture_layer.h
index 0ba26e6..232dba2 100644
--- a/cc/layers/picture_layer.h
+++ b/cc/layers/picture_layer.h
@@ -39,7 +39,7 @@ class CC_EXPORT PictureLayer : public Layer {
ContentLayerClient* client() { return client_; }
- PicturePile* GetPicturePileForTesting() const { return pile_.get(); }
+ PicturePile* GetPicturePileForTesting() { return &pile_; }
protected:
explicit PictureLayer(ContentLayerClient* client);
@@ -50,7 +50,7 @@ class CC_EXPORT PictureLayer : public Layer {
private:
ContentLayerClient* client_;
- scoped_refptr<PicturePile> pile_;
+ PicturePile pile_;
devtools_instrumentation::
ScopedLayerObjectTracker instrumentation_object_tracker_;
// Invalidation to use the next time update is called.