| Index: cc/picture_layer_impl.h
|
| diff --git a/cc/picture_layer_impl.h b/cc/picture_layer_impl.h
|
| index 91fa2e79b3fa25de5333fd7f81e6930a7db4e442..b4a97291403c48afb5da1ee0d394c2352fa7c7fd 100644
|
| --- a/cc/picture_layer_impl.h
|
| +++ b/cc/picture_layer_impl.h
|
| @@ -29,6 +29,9 @@ public:
|
|
|
| // LayerImpl overrides.
|
| virtual const char* layerTypeAsString() const OVERRIDE;
|
| + virtual scoped_ptr<LayerImpl> createLayerImpl(
|
| + LayerTreeImpl* treeImpl) OVERRIDE;
|
| + virtual void pushPropertiesTo(LayerImpl* layer) OVERRIDE;
|
| virtual void appendQuads(QuadSink&, AppendQuadsData&) OVERRIDE;
|
| virtual void dumpLayerProperties(std::string*, int indent) const OVERRIDE;
|
| virtual void didUpdateTransforms() OVERRIDE;
|
| @@ -50,6 +53,9 @@ public:
|
| void SyncFromActiveLayer();
|
| void SyncTiling(const PictureLayerTiling* tiling);
|
|
|
| + void CreateTilingSet();
|
| + void TransferTilingSet(scoped_ptr<PictureLayerTilingSet> tilings);
|
| +
|
| // Mask-related functions
|
| void SetIsMask(bool is_mask);
|
| virtual ResourceProvider::ResourceId contentsResourceId() const OVERRIDE;
|
| @@ -64,7 +70,7 @@ protected:
|
| void ManageTilings(float ideal_contents_scale);
|
| void CleanUpUnusedTilings(std::vector<PictureLayerTiling*> used_tilings);
|
|
|
| - PictureLayerTilingSet tilings_;
|
| + scoped_ptr<PictureLayerTilingSet> tilings_;
|
| scoped_refptr<PicturePileImpl> pile_;
|
| Region invalidation_;
|
|
|
|
|