Index: cc/layers/picture_layer_impl.cc |
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc |
index 3dbce3cb6dab0bb1327dfb34bb0811fbccc7b8b6..5d775fe28dc5b619cf35d5dad4502350541727e8 100644 |
--- a/cc/layers/picture_layer_impl.cc |
+++ b/cc/layers/picture_layer_impl.cc |
@@ -143,11 +143,6 @@ void PictureLayerImpl::PushPropertiesTo(LayerImpl* base_layer) { |
layer_impl->low_res_raster_contents_scale_ = low_res_raster_contents_scale_; |
layer_impl->SanityCheckTilingState(); |
- |
- // We always need to push properties. |
- // See http://crbug.com/303943 |
- // TODO(danakj): Stop always pushing properties since we don't swap tilings. |
- needs_push_properties_ = true; |
} |
void PictureLayerImpl::AppendQuads(RenderPass* render_pass, |
@@ -573,6 +568,10 @@ void PictureLayerImpl::UpdateRasterSource( |
tilings_->UpdateTilingsToCurrentRasterSource( |
raster_source_, pending_set, invalidation_, MinimumContentsScale(), |
MaximumContentsScale()); |
+ |
+ // SetNeedsPushProperties when changing the tiling set or raster source. These |
+ // shouldn't imply damage but need to be synced. |
+ SetNeedsPushProperties(); |
vmpstr
2015/01/23 20:57:57
Should this be invoked using PLTS UpdateTilingsToC
danakj
2015/01/23 21:11:36
Only if it added a new tiling to the set.
|
} |
void PictureLayerImpl::NotifyTileStateChanged(const Tile* tile) { |
@@ -598,6 +597,10 @@ void PictureLayerImpl::ReleaseResources() { |
// the tilings have not been managed, request an update draw properties |
// to force tilings to get managed. |
layer_tree_impl()->set_needs_update_draw_properties(); |
+ |
+ // SetNeedsPushProperties when changing the tiling set or raster source. These |
+ // shouldn't imply damage but need to be synced. |
+ SetNeedsPushProperties(); |
vmpstr
2015/01/23 20:57:58
Should this be invoked via PLTS constructor? Or is
danakj
2015/01/23 21:11:36
The constructor doesn't add any tilings, and the d
|
} |
skia::RefPtr<SkPicture> PictureLayerImpl::GetPicture() { |
@@ -656,6 +659,12 @@ bool PictureLayerImpl::RequiresHighResToDraw() const { |
return layer_tree_impl()->RequiresHighResToDraw(); |
} |
+void PictureLayerImpl::TilingSetChanged() { |
+ // SetNeedsPushProperties when changing the tiling set or raster source. These |
+ // shouldn't imply damage but need to be synced. |
+ SetNeedsPushProperties(); |
+} |
+ |
gfx::Size PictureLayerImpl::CalculateTileSize( |
const gfx::Size& content_bounds) const { |
int max_texture_size = |