Commit 33590bd0 authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Fix 64 bit truncation errors in platform/scheduler

Use appropriate types in scheduler code.

BUG=879657

Change-Id: I51e83b9fd5e6ec48706110bc4ae832d2075e89ca
Reviewed-on: https://chromium-review.googlesource.com/c/1287956
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: default avatarAlexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601265}
parent 46e94241
......@@ -55,7 +55,7 @@ SchedulerHelper::DefaultTaskRunner() {
return default_task_runner_;
}
void SchedulerHelper::SetWorkBatchSizeForTesting(size_t work_batch_size) {
void SchedulerHelper::SetWorkBatchSizeForTesting(int work_batch_size) {
CheckOnValidThread();
DCHECK(sequence_manager_.get());
sequence_manager_->SetWorkBatchSize(work_batch_size);
......
......@@ -99,7 +99,7 @@ class PLATFORM_EXPORT SchedulerHelper
bool HasCPUTimingForEachTask() const;
// Test helpers.
void SetWorkBatchSizeForTesting(size_t work_batch_size);
void SetWorkBatchSizeForTesting(int work_batch_size);
protected:
void InitDefaultQueues(
......
......@@ -444,7 +444,7 @@ void TaskQueueThrottler::AsValueInto(base::trace_event::TracedValue* state,
for (const auto& map_entry : queue_details_) {
state->BeginDictionaryWithCopiedName(PointerToString(map_entry.first));
state->SetInteger("throttling_ref_count",
map_entry.second.throttling_ref_count);
static_cast<int>(map_entry.second.throttling_ref_count));
state->EndDictionary();
}
state->EndDictionary();
......
......@@ -2349,14 +2349,16 @@ void MainThreadSchedulerImpl::ResetForNavigationLocked() {
UpdatePolicyLocked(UpdateType::kMayEarlyOutIfPolicyUnchanged);
UMA_HISTOGRAM_COUNTS_100("RendererScheduler.WebViewsPerScheduler",
main_thread_only().page_schedulers.size());
base::saturated_cast<base::HistogramBase::Sample>(
main_thread_only().page_schedulers.size()));
size_t frame_count = 0;
for (PageSchedulerImpl* page_scheduler : main_thread_only().page_schedulers) {
frame_count += page_scheduler->FrameCount();
}
UMA_HISTOGRAM_COUNTS_100("RendererScheduler.WebFramesPerScheduler",
frame_count);
UMA_HISTOGRAM_COUNTS_100(
"RendererScheduler.WebFramesPerScheduler",
base::saturated_cast<base::HistogramBase::Sample>(frame_count));
}
void MainThreadSchedulerImpl::SetTopLevelBlameContext(
......@@ -2600,7 +2602,7 @@ UkmRecordingStatus MainThreadSchedulerImpl::RecordTaskUkmImpl(
// Trade off for privacy: Round to seconds for times below 10 minutes and
// minutes afterwards.
int seconds_since_backgrounded = 0;
int64_t seconds_since_backgrounded = 0;
if (time_since_backgrounded < base::TimeDelta::FromMinutes(10)) {
seconds_since_backgrounded = time_since_backgrounded.InSeconds();
} else {
......
......@@ -21,9 +21,9 @@ constexpr const char kPrioritizeCompositingAfterInputTrial[] =
constexpr const char kNumberOfCompositingTasksToPrioritizeAfterInputParam[] =
"number_of_tasks";
constexpr size_t kDefaultNumberOfTasksToPrioritizeAfterInput = 1;
constexpr int kDefaultNumberOfTasksToPrioritizeAfterInput = 1;
size_t GetNumberOfCompositingTasksToPrioritizeAfterInput() {
int GetNumberOfCompositingTasksToPrioritizeAfterInput() {
if (!base::FeatureList::IsEnabled(kPrioritizeCompositingAfterInput))
return 0;
int number_of_tasks;
......
......@@ -254,7 +254,7 @@ QueueingTimeEstimator::RunningAverage::RunningAverage(int size) {
}
int QueueingTimeEstimator::RunningAverage::GetStepsPerWindow() const {
return circular_buffer_.size();
return static_cast<int>(circular_buffer_.size());
}
void QueueingTimeEstimator::RunningAverage::Add(base::TimeDelta bin_value) {
......
......@@ -51,7 +51,7 @@ class WebThreadImplForRendererSchedulerTest : public testing::Test {
~WebThreadImplForRendererSchedulerTest() override = default;
void SetWorkBatchSizeForTesting(size_t work_batch_size) {
void SetWorkBatchSizeForTesting(int work_batch_size) {
scheduler_->GetSchedulerHelperForTesting()->SetWorkBatchSizeForTesting(
work_batch_size);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment