Reland: cc: Fix size_t to int truncations in layers/ output/ playback/ quads/

cc/layers/heads_up_display_layer_impl.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/heads_up_display_layer_impl.h"
 
 #include <algorithm>
 #include <vector>
 
+#include "base/numerics/safe_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/frame_rate_counter.h"
 #include "cc/debug/paint_time_counter.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/memory_history.h"
@@ skipping 356 matching lines @@
 SkRect HeadsUpDisplayLayerImpl::DrawFPSDisplay(
     SkCanvas* canvas,
     const FrameRateCounter* fps_counter,
     int right,
     int top) const {
   const int kPadding = 4;
   const int kGap = 6;
 
   const int kFontHeight = 15;
 
-  const int kGraphWidth = fps_counter->time_stamp_history_size() - 2;
+  const int kGraphWidth =
+      base::saturated_cast<int>(fps_counter->time_stamp_history_size()) - 2;
   const int kGraphHeight = 40;
 
   const int kHistogramWidth = 37;
 
   int width = kGraphWidth + kHistogramWidth + 4 * kPadding;
   int height = kFontHeight + kGraphHeight + 4 * kPadding + 2;
   int left = bounds().width() - width - right;
   SkRect area = SkRect::MakeXYWH(left, top, width, height);
 
   SkPaint paint = CreatePaint();
@@ skipping 221 matching lines @@
 }
 
 SkRect HeadsUpDisplayLayerImpl::DrawPaintTimeDisplay(
     SkCanvas* canvas,
     const PaintTimeCounter* paint_time_counter,
     int right,
     int top) const {
   const int kPadding = 4;
   const int kFontHeight = 14;
 
-  const int kGraphWidth = paint_time_counter->HistorySize();
+  const int kGraphWidth =
+      base::saturated_cast<int>(paint_time_counter->HistorySize());
   const int kGraphHeight = 40;
 
   SkPaint paint = CreatePaint();
 
   const std::string title = "Compositor frame time (ms)";
   int title_text_width = MeasureText(&paint, title, kFontHeight);
   int contents_width = std::max(title_text_width, kGraphWidth);
 
   const int width = contents_width + 2 * kPadding;
   const int height =
@@ skipping 222 matching lines @@
   return "cc::HeadsUpDisplayLayerImpl";
 }
 
 void HeadsUpDisplayLayerImpl::AsValueInto(
     base::trace_event::TracedValue* dict) const {
   LayerImpl::AsValueInto(dict);
   dict->SetString("layer_name", "Heads Up Display Layer");
 }
 
 }  // namespace cc