Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: cc/resources/picture_layer_tiling_set.cc

Issue 1108773003: Revert of cc: Remove tile sharing from tilings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/picture_layer_tiling_set.h ('k') | cc/resources/picture_layer_tiling_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7c482bd7d30f4980562300bdf893a4a760326eec..93d85f7b22e33212fc4ef30436317bd6f8978d6e 100644
--- a/cc/resources/picture_layer_tiling_set.cc
+++ b/cc/resources/picture_layer_tiling_set.cc
@@ -55,8 +55,7 @@
void PictureLayerTilingSet::CopyTilingsAndPropertiesFromPendingTwin(
const PictureLayerTilingSet* pending_twin_set,
- const scoped_refptr<RasterSource>& raster_source,
- const Region& layer_invalidation) {
+ const scoped_refptr<RasterSource>& raster_source) {
if (pending_twin_set->tilings_.empty()) {
// If the twin (pending) tiling set is empty, it was not updated for the
// current frame. So we drop tilings from our set as well, instead of
@@ -78,8 +77,7 @@
this_tiling = tilings_.back();
tiling_sort_required = true;
}
- this_tiling->TakeTilesAndPropertiesFrom(pending_twin_tiling,
- layer_invalidation);
+ this_tiling->CloneTilesAndPropertiesFrom(*pending_twin_tiling);
}
if (tiling_sort_required)
@@ -97,8 +95,7 @@
// Copy over tilings that are shared with the |pending_twin_set| tiling set.
// Also, copy all of the properties from twin tilings.
- CopyTilingsAndPropertiesFromPendingTwin(pending_twin_set, raster_source,
- layer_invalidation);
+ CopyTilingsAndPropertiesFromPendingTwin(pending_twin_set, raster_source);
// If the tiling is not shared (FindTilingWithScale returns nullptr), then
// invalidate tiles and update them to the new raster source.
@@ -149,9 +146,6 @@
for (PictureLayerTiling* tiling : tilings_) {
tiling->SetRasterSourceAndResize(raster_source);
tiling->Invalidate(layer_invalidation);
- // Since the invalidation changed, we need to create any missing tiles in
- // the live tiles rect again.
- tiling->CreateMissingTilesInLiveTilesRect();
tiling->VerifyAllTilesHaveCurrentRasterSource();
}
}
« no previous file with comments | « cc/resources/picture_layer_tiling_set.h ('k') | cc/resources/picture_layer_tiling_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698