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

Unified Diff: cc/trees/property_tree_builder.cc

Issue 2661523003: cc: Merge LayerTree into the LayerTreeHost. (Closed)
Patch Set: auto Created 3 years, 11 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/trees/layer_tree_host_unittest_video.cc ('k') | cc/trees/tree_synchronizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index f2596640dc775d925bf66e47d0afeec35acf2a38..375051ac04087affe87b921490b34eb9c0e83702 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -106,7 +106,7 @@ static inline bool IsRootLayer(const Layer* layer) {
}
static bool IsMetaInformationRecomputationNeeded(Layer* layer) {
- return layer->GetLayerTree()->needs_meta_info_recomputation();
+ return layer->layer_tree_host()->needs_meta_info_recomputation();
}
// Recursively walks the layer tree(if needed) to compute any information
@@ -140,7 +140,7 @@ static void PreCalculateMetaInformationInternal(
recursive_data->num_unclipped_descendants);
if (IsRootLayer(layer))
- layer->GetLayerTree()->SetNeedsMetaInfoRecomputation(false);
+ layer->layer_tree_host()->SetNeedsMetaInfoRecomputation(false);
}
static void PreCalculateMetaInformationInternalForTesting(
@@ -1509,7 +1509,7 @@ void PropertyTreeBuilder::BuildPropertyTrees(
PropertyTrees* property_trees) {
property_trees->is_main_thread = true;
property_trees->is_active = false;
- SkColor color = root_layer->GetLayerTree()->background_color();
+ SkColor color = root_layer->layer_tree_host()->background_color();
if (SkColorGetA(color) != 255)
color = SkColorSetA(color, 255);
BuildPropertyTreesTopLevelInternal(
@@ -1518,7 +1518,7 @@ void PropertyTreeBuilder::BuildPropertyTrees(
elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
device_transform, property_trees, color);
#if DCHECK_IS_ON()
- for (auto* layer : *root_layer->GetLayerTree())
+ for (auto* layer : *root_layer->layer_tree_host())
CheckScrollAndClipPointersForLayer(layer);
#endif
property_trees->ResetCachedData();
« no previous file with comments | « cc/trees/layer_tree_host_unittest_video.cc ('k') | cc/trees/tree_synchronizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698