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

Unified Diff: cc/layers/heads_up_display_layer_impl.cc

Issue 1158433010: Reland: cc: Fix size_t to int truncations in layers/ output/ playback/ quads/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: cc/layers/heads_up_display_layer_impl.cc
diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc
index 986c332e406c7ac64f6ef5538b212a758c2f1725..fad85a09ee9eee2a9b97711e28e7474be89966be 100644
--- a/cc/layers/heads_up_display_layer_impl.cc
+++ b/cc/layers/heads_up_display_layer_impl.cc
@@ -7,6 +7,7 @@
#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"
@@ -383,7 +384,8 @@ SkRect HeadsUpDisplayLayerImpl::DrawFPSDisplay(
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;
@@ -625,7 +627,8 @@ SkRect HeadsUpDisplayLayerImpl::DrawPaintTimeDisplay(
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();

Powered by Google App Engine
This is Rietveld 408576698