Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 40ed7acfe7ab8c8ec84e62440254ceebc2b4839b..f4bfada437edcb82f37eb32196d1fb574d13bcd8 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -20,7 +20,6 @@ |
#include "cc/animation/layer_animation_controller.h" |
#include "cc/base/math_util.h" |
#include "cc/debug/devtools_instrumentation.h" |
-#include "cc/debug/overdraw_metrics.h" |
#include "cc/debug/rendering_stats_instrumentation.h" |
#include "cc/input/top_controls_manager.h" |
#include "cc/layers/heads_up_display_layer.h" |
@@ -903,8 +902,7 @@ void LayerTreeHost::SetPrioritiesForLayers( |
} |
void LayerTreeHost::PrioritizeTextures( |
- const RenderSurfaceLayerList& render_surface_layer_list, |
- OverdrawMetrics* metrics) { |
+ const RenderSurfaceLayerList& render_surface_layer_list) { |
if (!contents_texture_manager_) |
return; |
@@ -916,11 +914,6 @@ void LayerTreeHost::PrioritizeTextures( |
SetPrioritiesForLayers(render_surface_layer_list); |
SetPrioritiesForSurfaces(memory_for_render_surfaces_metric); |
- metrics->DidUseContentsTextureMemoryBytes( |
- contents_texture_manager_->MemoryAboveCutoffBytes()); |
- metrics->DidUseRenderSurfaceTextureMemoryBytes( |
- memory_for_render_surfaces_metric); |
- |
contents_texture_manager_->PrioritizeTextures(); |
} |
@@ -983,17 +976,12 @@ void LayerTreeHost::PaintLayerContents( |
ResourceUpdateQueue* queue, |
bool* did_paint_content, |
bool* need_more_updates) { |
- bool record_metrics_for_frame = |
- settings_.show_overdraw_in_tracing && |
- base::debug::TraceLog::GetInstance() && |
- base::debug::TraceLog::GetInstance()->IsEnabled(); |
OcclusionTracker<Layer> occlusion_tracker( |
- root_layer_->render_surface()->content_rect(), record_metrics_for_frame); |
+ root_layer_->render_surface()->content_rect()); |
occlusion_tracker.set_minimum_tracking_size( |
settings_.minimum_occlusion_tracking_size); |
- PrioritizeTextures(render_surface_layer_list, |
- occlusion_tracker.overdraw_metrics()); |
+ PrioritizeTextures(render_surface_layer_list); |
in_paint_layer_contents_ = true; |
@@ -1020,8 +1008,6 @@ void LayerTreeHost::PaintLayerContents( |
} |
in_paint_layer_contents_ = false; |
- |
- occlusion_tracker.overdraw_metrics()->RecordMetrics(this); |
} |
void LayerTreeHost::ApplyScrollAndScale(const ScrollAndScaleSet& info) { |