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

Unified Diff: content/renderer/devtools/v8_sampling_profiler.cc

Issue 1424703003: Kills TraceTicks, which was functionally the same as TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed win compile error. Created 5 years, 1 month 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
« no previous file with comments | « content/child/blink_platform_impl.cc ('k') | gpu/command_buffer/client/gles2_implementation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/devtools/v8_sampling_profiler.cc
diff --git a/content/renderer/devtools/v8_sampling_profiler.cc b/content/renderer/devtools/v8_sampling_profiler.cc
index cdad93b20063b65d286b637f5911fe185965bd60..1d68652c700ff7279838981d45270b5c5d381246 100644
--- a/content/renderer/devtools/v8_sampling_profiler.cc
+++ b/content/renderer/devtools/v8_sampling_profiler.cc
@@ -97,14 +97,14 @@ class SampleRecord {
SampleRecord() {}
- base::TraceTicks timestamp() const { return timestamp_; }
+ base::TimeTicks timestamp() const { return timestamp_; }
void Collect(v8::Isolate* isolate,
- base::TraceTicks timestamp,
+ base::TimeTicks timestamp,
const v8::RegisterState& state);
scoped_refptr<ConvertableToTraceFormat> ToTraceFormat() const;
private:
- base::TraceTicks timestamp_;
+ base::TimeTicks timestamp_;
unsigned vm_state_ : 4;
unsigned frames_count_ : kMaxFramesCountLog2;
const void* frames_[kMaxFramesCount];
@@ -113,7 +113,7 @@ class SampleRecord {
};
void SampleRecord::Collect(v8::Isolate* isolate,
- base::TraceTicks timestamp,
+ base::TimeTicks timestamp,
const v8::RegisterState& state) {
v8::SampleInfo sample_info;
isolate->GetStackSample(state, (void**)frames_, kMaxFramesCount,
@@ -284,7 +284,7 @@ void Sampler::Sample() {
void Sampler::DoSample(const v8::RegisterState& state) {
// Called in the sampled thread signal handler.
// Because of that it is not allowed to do any memory allocation here.
- base::TraceTicks timestamp = base::TraceTicks::Now();
+ base::TimeTicks timestamp = base::TimeTicks::Now();
SampleRecord* record = samples_data_->StartEnqueue();
if (!record)
return;
@@ -298,7 +298,7 @@ void Sampler::InjectPendingEvents() {
TRACE_EVENT_SAMPLE_WITH_TID_AND_TIMESTAMP1(
TRACE_DISABLED_BY_DEFAULT("v8.cpu_profile"), "V8Sample",
platform_data_.thread_id(),
- (record->timestamp() - base::TraceTicks()).InMicroseconds(), "data",
+ (record->timestamp() - base::TimeTicks()).InMicroseconds(), "data",
record->ToTraceFormat());
samples_data_->Remove();
record = samples_data_->Peek();
« no previous file with comments | « content/child/blink_platform_impl.cc ('k') | gpu/command_buffer/client/gles2_implementation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698