| Index: cc/tiles/picture_layer_tiling_set.h
|
| diff --git a/cc/tiles/picture_layer_tiling_set.h b/cc/tiles/picture_layer_tiling_set.h
|
| index c6d3589d333e011e57913e6fed39b086d822afbc..ed1038f819cd7acabe3434b6ae157aebf71595c4 100644
|
| --- a/cc/tiles/picture_layer_tiling_set.h
|
| +++ b/cc/tiles/picture_layer_tiling_set.h
|
| @@ -9,7 +9,6 @@
|
| #include <vector>
|
|
|
| #include "cc/base/region.h"
|
| -#include "cc/base/scoped_ptr_vector.h"
|
| #include "cc/tiles/picture_layer_tiling.h"
|
| #include "ui/gfx/geometry/size.h"
|
|
|
| @@ -79,9 +78,9 @@ class CC_EXPORT PictureLayerTilingSet {
|
| scoped_refptr<DisplayListRasterSource> raster_source);
|
| size_t num_tilings() const { return tilings_.size(); }
|
| int NumHighResTilings() const;
|
| - PictureLayerTiling* tiling_at(size_t idx) { return tilings_[idx]; }
|
| + PictureLayerTiling* tiling_at(size_t idx) { return tilings_[idx].get(); }
|
| const PictureLayerTiling* tiling_at(size_t idx) const {
|
| - return tilings_[idx];
|
| + return tilings_[idx].get();
|
| }
|
| WhichTree tree() const { return tree_; }
|
|
|
| @@ -188,7 +187,7 @@ class CC_EXPORT PictureLayerTilingSet {
|
| void Remove(PictureLayerTiling* tiling);
|
| void VerifyTilings(const PictureLayerTilingSet* pending_twin_set) const;
|
|
|
| - ScopedPtrVector<PictureLayerTiling> tilings_;
|
| + std::vector<scoped_ptr<PictureLayerTiling>> tilings_;
|
|
|
| const size_t tiling_interest_area_padding_;
|
| const float skewport_target_time_in_seconds_;
|
|
|