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

Unified Diff: cc/debug/debug_rect_history.cc

Issue 2080703005: cc: Remove LayerTreeImpl::root_layer usage outside tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/debug/debug_rect_history.h ('k') | cc/test/layer_tree_json_parser_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/debug/debug_rect_history.cc
diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc
index ed7c611fc4cccccbac6677da1b3a294b86a5498c..c5ab6de70517318b0ed112fd5ddd05fdb026721f 100644
--- a/cc/debug/debug_rect_history.cc
+++ b/cc/debug/debug_rect_history.cc
@@ -31,7 +31,7 @@ DebugRectHistory::DebugRectHistory() {}
DebugRectHistory::~DebugRectHistory() {}
void DebugRectHistory::SaveDebugRectsForCurrentFrame(
- LayerImpl* root_layer,
+ LayerTreeImpl* tree_impl,
LayerImpl* hud_layer,
const LayerImplList& render_surface_layer_list,
const LayerTreeDebugState& debug_state) {
@@ -40,19 +40,19 @@ void DebugRectHistory::SaveDebugRectsForCurrentFrame(
debug_rects_.clear();
if (debug_state.show_touch_event_handler_rects)
- SaveTouchEventHandlerRects(root_layer->layer_tree_impl());
+ SaveTouchEventHandlerRects(tree_impl);
if (debug_state.show_wheel_event_handler_rects)
- SaveWheelEventHandlerRects(root_layer);
+ SaveWheelEventHandlerRects(tree_impl);
if (debug_state.show_scroll_event_handler_rects)
- SaveScrollEventHandlerRects(root_layer->layer_tree_impl());
+ SaveScrollEventHandlerRects(tree_impl);
if (debug_state.show_non_fast_scrollable_rects)
- SaveNonFastScrollableRects(root_layer->layer_tree_impl());
+ SaveNonFastScrollableRects(tree_impl);
if (debug_state.show_paint_rects)
- SavePaintRects(root_layer);
+ SavePaintRects(tree_impl);
if (debug_state.show_property_changed_rects)
SavePropertyChangedRects(render_surface_layer_list, hud_layer);
@@ -67,12 +67,12 @@ void DebugRectHistory::SaveDebugRectsForCurrentFrame(
SaveLayerAnimationBoundsRects(render_surface_layer_list);
}
-void DebugRectHistory::SavePaintRects(LayerImpl* root_layer) {
+void DebugRectHistory::SavePaintRects(LayerTreeImpl* tree_impl) {
// We would like to visualize where any layer's paint rect (update rect) has
// changed, regardless of whether this layer is skipped for actual drawing or
// not. Therefore we traverse over all layers, not just the render surface
// list.
- for (auto* layer : *root_layer->layer_tree_impl()) {
+ for (auto* layer : *tree_impl) {
Region invalidation_region = layer->GetInvalidationRegionForDebugging();
if (invalidation_region.IsEmpty() || !layer->DrawsContent())
continue;
@@ -174,10 +174,9 @@ void DebugRectHistory::SaveTouchEventHandlerRectsCallback(LayerImpl* layer) {
}
}
-void DebugRectHistory::SaveWheelEventHandlerRects(LayerImpl* root_layer) {
+void DebugRectHistory::SaveWheelEventHandlerRects(LayerTreeImpl* tree_impl) {
EventListenerProperties event_properties =
- root_layer->layer_tree_impl()->event_listener_properties(
- EventListenerClass::kMouseWheel);
+ tree_impl->event_listener_properties(EventListenerClass::kMouseWheel);
if (event_properties == EventListenerProperties::kNone ||
event_properties == EventListenerProperties::kPassive) {
return;
@@ -185,8 +184,7 @@ void DebugRectHistory::SaveWheelEventHandlerRects(LayerImpl* root_layer) {
// Since the wheel event handlers property is on the entire layer tree just
// mark inner viewport if have listeners.
- LayerImpl* inner_viewport =
- root_layer->layer_tree_impl()->InnerViewportScrollLayer();
+ LayerImpl* inner_viewport = tree_impl->InnerViewportScrollLayer();
if (!inner_viewport)
return;
debug_rects_.push_back(DebugRect(
« no previous file with comments | « cc/debug/debug_rect_history.h ('k') | cc/test/layer_tree_json_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698