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

Side by Side Diff: cc/trees/layer_tree_host.cc

Issue 1641023002: cc: Fix badly-scoped trace event for CDP in LTH::DoUpdateLayers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 Layer* root_scroll = FindFirstScrollableLayer(root_layer); 812 Layer* root_scroll = FindFirstScrollableLayer(root_layer);
813 Layer* page_scale_layer = page_scale_layer_.get(); 813 Layer* page_scale_layer = page_scale_layer_.get();
814 if (!page_scale_layer && root_scroll) 814 if (!page_scale_layer && root_scroll)
815 page_scale_layer = root_scroll->parent(); 815 page_scale_layer = root_scroll->parent();
816 816
817 if (hud_layer_.get()) { 817 if (hud_layer_.get()) {
818 hud_layer_->PrepareForCalculateDrawProperties(device_viewport_size(), 818 hud_layer_->PrepareForCalculateDrawProperties(device_viewport_size(),
819 device_scale_factor_); 819 device_scale_factor_);
820 } 820 }
821 821
822
823 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps");
824
825 LayerTreeHostCommon::PreCalculateMetaInformation(root_layer);
826
827 gfx::Transform identity_transform; 822 gfx::Transform identity_transform;
828 LayerList update_layer_list; 823 LayerList update_layer_list;
829 824
830 { 825 {
826 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::BuildPropertyTrees");
831 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), 827 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"),
832 "LayerTreeHostCommon::ComputeVisibleRectsWithPropertyTrees"); 828 "LayerTreeHostCommon::ComputeVisibleRectsWithPropertyTrees");
829 LayerTreeHostCommon::PreCalculateMetaInformation(root_layer);
833 bool can_render_to_separate_surface = true; 830 bool can_render_to_separate_surface = true;
834 BuildPropertyTreesAndComputeVisibleRects( 831 BuildPropertyTreesAndComputeVisibleRects(
835 root_layer, page_scale_layer, inner_viewport_scroll_layer_.get(), 832 root_layer, page_scale_layer, inner_viewport_scroll_layer_.get(),
836 outer_viewport_scroll_layer_.get(), overscroll_elasticity_layer_.get(), 833 outer_viewport_scroll_layer_.get(), overscroll_elasticity_layer_.get(),
837 elastic_overscroll_, page_scale_factor_, device_scale_factor_, 834 elastic_overscroll_, page_scale_factor_, device_scale_factor_,
838 gfx::Rect(device_viewport_size_), identity_transform, 835 gfx::Rect(device_viewport_size_), identity_transform,
839 can_render_to_separate_surface, &property_trees_, &update_layer_list); 836 can_render_to_separate_surface, &property_trees_, &update_layer_list);
840 } 837 }
841 838
842 for (const auto& layer : update_layer_list) 839 for (const auto& layer : update_layer_list)
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 1433
1437 // It is required to create new PropertyTrees before deserializing it. 1434 // It is required to create new PropertyTrees before deserializing it.
1438 property_trees_ = PropertyTrees(); 1435 property_trees_ = PropertyTrees();
1439 property_trees_.FromProtobuf(proto.property_trees()); 1436 property_trees_.FromProtobuf(proto.property_trees());
1440 1437
1441 surface_id_namespace_ = proto.surface_id_namespace(); 1438 surface_id_namespace_ = proto.surface_id_namespace();
1442 next_surface_sequence_ = proto.next_surface_sequence(); 1439 next_surface_sequence_ = proto.next_surface_sequence();
1443 } 1440 }
1444 1441
1445 } // namespace cc 1442 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698