diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/task_management/sampling/task_group.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/task_manager/task_manager.cc | 5 | ||||
| -rw-r--r-- | chrome/common/spellcheck_marker.h | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/task_management/sampling/task_group.cc b/chrome/browser/task_management/sampling/task_group.cc index c8d9bf1..9911136 100644 --- a/chrome/browser/task_management/sampling/task_group.cc +++ b/chrome/browser/task_management/sampling/task_group.cc @@ -188,7 +188,7 @@ void TaskGroup::RefreshGpuMemory( return; } - gpu_memory_ = static_cast<int64_t>(itr->second.video_memory); + gpu_memory_ = itr->second.video_memory; gpu_memory_has_duplicates_ = itr->second.has_duplicates; } diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 0ae5fb3..7d87aa7 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -8,6 +8,7 @@ #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" #include "base/location.h" +#include "base/numerics/safe_conversions.h" #include "base/process/process_metrics.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" @@ -666,7 +667,9 @@ bool TaskManagerModel::GetVideoMemory(int index, if (i == video_memory_usage_stats_.process_map.end()) return false; values.is_video_memory_valid = true; - values.video_memory = i->second.video_memory; + // If this checked_cast asserts, then need to change this code to use + // uint64_t instead of size_t. + values.video_memory = base::checked_cast<size_t>(i->second.video_memory); values.video_memory_has_duplicates = i->second.has_duplicates; } *video_memory = values.video_memory; diff --git a/chrome/common/spellcheck_marker.h b/chrome/common/spellcheck_marker.h index 4305c22..ac278536 100644 --- a/chrome/common/spellcheck_marker.h +++ b/chrome/common/spellcheck_marker.h @@ -29,6 +29,9 @@ class SpellCheckMarker { : hash(hash), offset(offset) {} uint32_t hash; + // Note: we use uint32_t instead of size_t because this struct is sent over + // IPC which could span 32 & 64 bit processes. This is fine since the offset + // shouldn't exceed UINT32_MAX even on 64 bit builds. uint32_t offset; }; |