Index: cc/resources/picture_layer_tiling_set.cc |
diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc |
index 8d98d66653e9ead11f6243660e10b37cf5237cc6..ed4bfdfc19b85a2a79f7f7956dc2863c4d9a1850 100644 |
--- a/cc/resources/picture_layer_tiling_set.cc |
+++ b/cc/resources/picture_layer_tiling_set.cc |
@@ -34,20 +34,18 @@ void PictureLayerTilingSet::SetClient(PictureLayerTilingClient* client) { |
void PictureLayerTilingSet::CloneAll( |
const PictureLayerTilingSet& other, |
- const Region& invalidation, |
float minimum_contents_scale) { |
tilings_.clear(); |
tilings_.reserve(other.tilings_.size()); |
for (size_t i = 0; i < other.tilings_.size(); ++i) { |
if (other.tilings_[i]->contents_scale() < minimum_contents_scale) |
continue; |
- Clone(other.tilings_[i], invalidation); |
+ Clone(other.tilings_[i]); |
} |
} |
void PictureLayerTilingSet::Clone( |
- const PictureLayerTiling* tiling, |
- const Region& invalidation) { |
+ const PictureLayerTiling* tiling) { |
enne (OOO)
2013/03/29 20:50:58
style nit: this can fit on one line now.
whunt
2013/03/29 21:52:04
Done.
|
for (size_t i = 0; i < tilings_.size(); ++i) |
DCHECK_NE(tilings_[i]->contents_scale(), tiling->contents_scale()); |
@@ -55,7 +53,6 @@ void PictureLayerTilingSet::Clone( |
tilings_.push_back(tiling->Clone()); |
gfx::Size size = tilings_.back()->layer_bounds(); |
tilings_.back()->SetClient(client_); |
- tilings_.back()->Invalidate(invalidation); |
// Intentionally use this set's layer bounds, as it may have changed. |
tilings_.back()->SetLayerBounds(layer_bounds_); |
@@ -74,11 +71,6 @@ gfx::Size PictureLayerTilingSet::LayerBounds() const { |
return layer_bounds_; |
} |
-void PictureLayerTilingSet::Invalidate(const Region& layer_invalidation) { |
- for (size_t i = 0; i < tilings_.size(); ++i) |
- tilings_[i]->Invalidate(layer_invalidation); |
-} |
- |
PictureLayerTiling* PictureLayerTilingSet::AddTiling(float contents_scale) { |
tilings_.push_back(PictureLayerTiling::Create(contents_scale)); |
PictureLayerTiling* appended = tilings_.back(); |
@@ -106,11 +98,6 @@ void PictureLayerTilingSet::RemoveAllTiles() { |
tilings_[i]->Reset(); |
} |
-void PictureLayerTilingSet::CreateTilesFromLayerRect(gfx::Rect layer_rect) { |
- for (size_t i = 0; i < tilings_.size(); ++i) |
- tilings_[i]->CreateTilesFromLayerRect(layer_rect); |
-} |
- |
PictureLayerTilingSet::Iterator::Iterator( |
const PictureLayerTilingSet* set, |
float contents_scale, |