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

Unified Diff: base/profiler/stack_sampling_profiler.cc

Issue 1325653003: Type change in StackSamplingProfiler from void* to uintptr_t. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@UMA2_refactor
Patch Set: Accidentally removed const qualifiers from unittest. Created 5 years, 4 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: base/profiler/stack_sampling_profiler.cc
diff --git a/base/profiler/stack_sampling_profiler.cc b/base/profiler/stack_sampling_profiler.cc
index 00a79b55bd7fd465f423fa3202bb48661d26e96a..025dbbd5778820dec14df4d1272844f9bb8b8d35 100644
--- a/base/profiler/stack_sampling_profiler.cc
+++ b/base/profiler/stack_sampling_profiler.cc
@@ -83,8 +83,9 @@ void AsyncRunner::RunCallbackAndDeleteInstance(
// StackSamplingProfiler::Module ----------------------------------------------
-StackSamplingProfiler::Module::Module() : base_address(nullptr) {}
-StackSamplingProfiler::Module::Module(const void* base_address,
+StackSamplingProfiler::Module::Module()
+ : base_address(reinterpret_cast<uintptr_t>(nullptr)) {}
Mike Wittman 2015/09/01 01:42:15 nit: just base_address(0u)
sydli 2015/09/03 16:21:15 Done.
+StackSamplingProfiler::Module::Module(const uintptr_t base_address,
const std::string& id,
const FilePath& filename)
: base_address(base_address), id(id), filename(filename) {}
@@ -93,13 +94,15 @@ StackSamplingProfiler::Module::~Module() {}
// StackSamplingProfiler::Frame -----------------------------------------------
-StackSamplingProfiler::Frame::Frame(const void* instruction_pointer,
+StackSamplingProfiler::Frame::Frame(uintptr_t instruction_pointer,
size_t module_index)
: instruction_pointer(instruction_pointer),
module_index(module_index) {}
StackSamplingProfiler::Frame::~Frame() {}
+StackSamplingProfiler::Frame::Frame() {}
+
// StackSamplingProfiler::CallStackProfile ------------------------------------
StackSamplingProfiler::CallStackProfile::CallStackProfile() {}

Powered by Google App Engine
This is Rietveld 408576698