mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-29 18:18:27 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1164268 - Add some logging to browser_perf-compatibility-05.js, r=me (55c0ed222) - Bug 1166126 - Increase the size of the tag buffer in the profiler. r=mstange (cabe3d690) - Bug 1159486 - Make profiler use the process creation time. r=shu, r=jsantell (4e285c7db) - correctly apply Bug 1287912. r=bz (66644beac) - Bug 1187386 (Part 7) - Eliminate remaining dependencies on a non-null mImage in Decoder. r=tn (b1e3861b6) - Bug 1179451 - Part 1: Rewrite some ternary operators as if/else. r=froydnj (a46f4508f) - Bug 1179451 - Part 2: Fix incorrect return type. r=ehsan (a68ef3d67) - Bug 1179451 - Part 3: Use .get() to assign nsRefPtrs to raw pointers. r=froydnj (59155974f) - Bug 1179451 - Part 4: Don't pass nsRefPtr&& to functions that want raw pointers. r=froydnj (2a7893a33) - Bug 1179451 - Part 5: Delete nsRefPtr<T>::operator T*()&&. r=froydnj (891e019b0)
This commit is contained in:
@@ -99,6 +99,10 @@ ProfilerActor.prototype = {
|
||||
threadFilters: request.threadFilters || DEFAULT_PROFILER_OPTIONS.threadFilters,
|
||||
};
|
||||
|
||||
// The start time should be before any samples we might be
|
||||
// interested in.
|
||||
let currentTime = nsIProfilerModule.getElapsedTime();
|
||||
|
||||
nsIProfilerModule.StartProfiler(
|
||||
options.entries,
|
||||
options.interval,
|
||||
@@ -109,7 +113,7 @@ ProfilerActor.prototype = {
|
||||
);
|
||||
let { position, totalSize, generation } = this.onGetBufferInfo();
|
||||
|
||||
return { started: true, position, totalSize, generation };
|
||||
return { started: true, position, totalSize, generation, currentTime };
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user