diff options
| author | vadimt <vadimt@chromium.org> | 2015-05-06 15:14:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-06 22:15:24 +0000 |
| commit | b9d054ae28126276b156f55e6d10c25a38914de2 (patch) | |
| tree | 82f0fc7ef29a7ec6f94bcac6fb50af6521b65bd2 /base/tracked_objects.h | |
| parent | ef55bcf4785c6b07da4017626bf6e0d8a62458b9 (diff) | |
| download | chromium_src-b9d054ae28126276b156f55e6d10c25a38914de2.zip chromium_src-b9d054ae28126276b156f55e6d10c25a38914de2.tar.gz chromium_src-b9d054ae28126276b156f55e6d10c25a38914de2.tar.bz2 | |
Revert of Revert of Inlining DeathData accessors, per earlier CR's comment (patchset #1 id:1 of https://codereview.chromium.org/1118753003/)
Reason for revert:
Since the crash reports started before the original CL landed, reverting the revert.
Original issue's description:
> Revert of Inlining DeathData accessors, per earlier CR's comment (patchset #1 id:1 of https://codereview.chromium.org/1113463003/)
>
> Reason for revert:
> Suspecting this CL caused crashes (https://code.google.com/p/chromium/issues/detail?id=483255).
>
> Original issue's description:
> > Inlining DeathData accessors, per earlier CR's comment.
> >
> > BUG=456354
> >
> > Committed: https://crrev.com/9e0a3c19c221db002fdd5512b0d56dde675e005b
> > Cr-Commit-Position: refs/heads/master@{#327350}
>
> TBR=asvitkine@google.com,isherman@chromium.org,asvitkine@chromium.org,cpu@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=456354
>
> Committed: https://crrev.com/f02f0cc4ee8f12e53cd57a97bd2d6ef4c3af87ff
> Cr-Commit-Position: refs/heads/master@{#327798}
TBR=asvitkine@google.com,isherman@chromium.org,asvitkine@chromium.org,cpu@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=456354
Review URL: https://codereview.chromium.org/1129073002
Cr-Commit-Position: refs/heads/master@{#328625}
Diffstat (limited to 'base/tracked_objects.h')
| -rw-r--r-- | base/tracked_objects.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/base/tracked_objects.h b/base/tracked_objects.h index cd69fb7..efa8859 100644 --- a/base/tracked_objects.h +++ b/base/tracked_objects.h @@ -330,14 +330,16 @@ class BASE_EXPORT DeathData { // Metrics and past snapshots accessors, used only for serialization and in // tests. - int count() const; - int32 run_duration_sum() const; - int32 run_duration_max() const; - int32 run_duration_sample() const; - int32 queue_duration_sum() const; - int32 queue_duration_max() const; - int32 queue_duration_sample() const; - const DeathDataPhaseSnapshot* last_phase_snapshot() const; + int count() const { return count_; } + int32 run_duration_sum() const { return run_duration_sum_; } + int32 run_duration_max() const { return run_duration_max_; } + int32 run_duration_sample() const { return run_duration_sample_; } + int32 queue_duration_sum() const { return queue_duration_sum_; } + int32 queue_duration_max() const { return queue_duration_max_; } + int32 queue_duration_sample() const { return queue_duration_sample_; } + const DeathDataPhaseSnapshot* last_phase_snapshot() const { + return last_phase_snapshot_; + } // Called when the current profiling phase, identified by |profiling_phase|, // ends. |