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

Unified Diff: cc/layers/picture_layer_impl.cc

Issue 551463005: Revert of cc: Add occlusion checker as a fixed view of occlusion tracker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/layers/picture_layer_impl.h ('k') | cc/layers/picture_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer_impl.cc
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index f81fa01ad6df8c19e3ae775625d53ca087ff8eba..cb8141b66b83d56a7f334ef4cdbaea4717d172f2 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -420,10 +420,16 @@
}
void PictureLayerImpl::UpdateTiles(
- const Occlusion& occlusion_in_content_space) {
+ const OcclusionTracker<LayerImpl>* occlusion_tracker) {
TRACE_EVENT0("cc", "PictureLayerImpl::UpdateTiles");
DoPostCommitInitializationIfNeeded();
+
+ // TODO(danakj): We should always get an occlusion tracker when we are using
+ // occlusion, so update this check when we don't use a pending tree in the
+ // browser compositor.
+ DCHECK(!occlusion_tracker ||
+ layer_tree_impl()->settings().use_occlusion_for_tile_prioritization);
visible_rect_for_tile_priority_ = visible_content_rect();
viewport_rect_for_tile_priority_ =
@@ -459,14 +465,14 @@
should_update_tile_priorities_ = true;
- UpdateTilePriorities(occlusion_in_content_space);
+ UpdateTilePriorities(occlusion_tracker);
if (layer_tree_impl()->IsPendingTree())
MarkVisibleResourcesAsRequired();
}
void PictureLayerImpl::UpdateTilePriorities(
- const Occlusion& occlusion_in_content_space) {
+ const OcclusionTracker<LayerImpl>* occlusion_tracker) {
TRACE_EVENT0("cc", "PictureLayerImpl::UpdateTilePriorities");
double current_frame_time_in_seconds =
@@ -496,7 +502,9 @@
visible_layer_rect,
ideal_contents_scale_,
current_frame_time_in_seconds,
- occlusion_in_content_space);
+ occlusion_tracker,
+ render_target(),
+ draw_transform());
}
// Tile priorities were modified.
@@ -748,7 +756,7 @@
// when we stop using the pending tree in the browser compositor. If we want
// to support occlusion tracking here, we need to dirty the draw properties
// or save occlusion as a draw property.
- UpdateTilePriorities(Occlusion());
+ UpdateTilePriorities(NULL);
}
}
« no previous file with comments | « cc/layers/picture_layer_impl.h ('k') | cc/layers/picture_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698