| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index 6dc9043559c3df4eeb2c286e7b6baf4f1f2dbecf..e3f1c8e9b5e0f54ca463be6a8234f4f316a51df5 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -14,6 +14,7 @@
|
| #include "base/containers/small_map.h"
|
| #include "base/json/json_writer.h"
|
| #include "base/metrics/histogram.h"
|
| +#include "base/numerics/safe_conversions.h"
|
| #include "base/stl_util.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/trace_event/trace_event_argument.h"
|
| @@ -572,9 +573,8 @@ void LayerTreeHostImpl::TrackDamageForAllSurfaces(
|
| // the root damage rect. The root damage rect is then used to scissor each
|
| // surface.
|
|
|
| - for (int surface_index = render_surface_layer_list.size() - 1;
|
| - surface_index >= 0;
|
| - --surface_index) {
|
| + for (size_t i = 0; i < render_surface_layer_list.size(); ++i) {
|
| + size_t surface_index = render_surface_layer_list.size() - 1 - i;
|
| LayerImpl* render_surface_layer = render_surface_layer_list[surface_index];
|
| RenderSurfaceImpl* render_surface = render_surface_layer->render_surface();
|
| DCHECK(render_surface);
|
| @@ -750,9 +750,8 @@ DrawResult LayerTreeHostImpl::CalculateRenderPasses(
|
| "RequiresHighResToDraw", RequiresHighResToDraw());
|
|
|
| // Create the render passes in dependency order.
|
| - for (int surface_index = frame->render_surface_layer_list->size() - 1;
|
| - surface_index >= 0;
|
| - --surface_index) {
|
| + for (size_t i = 0; i < frame->render_surface_layer_list->size(); ++i) {
|
| + size_t surface_index = frame->render_surface_layer_list->size() - 1 - i;
|
| LayerImpl* render_surface_layer =
|
| (*frame->render_surface_layer_list)[surface_index];
|
| RenderSurfaceImpl* render_surface = render_surface_layer->render_surface();
|
| @@ -996,14 +995,16 @@ DrawResult LayerTreeHostImpl::PrepareToDraw(FrameData* frame) {
|
| input_handler_client_->ReconcileElasticOverscrollAndRootScroll();
|
|
|
| UMA_HISTOGRAM_CUSTOM_COUNTS(
|
| - "Compositing.NumActiveLayers", active_tree_->NumLayers(), 1, 400, 20);
|
| + "Compositing.NumActiveLayers",
|
| + base::saturated_cast<int>(active_tree_->NumLayers()), 1, 400, 20);
|
|
|
| size_t total_picture_memory = 0;
|
| for (const PictureLayerImpl* layer : active_tree()->picture_layers())
|
| total_picture_memory += layer->GetRasterSource()->GetPictureMemoryUsage();
|
| if (total_picture_memory != 0) {
|
| - UMA_HISTOGRAM_COUNTS("Compositing.PictureMemoryUsageKb",
|
| - total_picture_memory / 1024);
|
| + UMA_HISTOGRAM_COUNTS(
|
| + "Compositing.PictureMemoryUsageKb",
|
| + base::saturated_cast<int>(total_picture_memory / 1024));
|
| }
|
|
|
| bool update_lcd_text = false;
|
|
|