OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/values.h" | 5 #include "base/values.h" |
6 #include "cc/debug/rendering_stats.h" | 6 #include "cc/debug/rendering_stats.h" |
7 | 7 |
8 namespace cc { | 8 namespace cc { |
9 | 9 |
10 MainThreadRenderingStats::MainThreadRenderingStats() | 10 MainThreadRenderingStats::MainThreadRenderingStats() |
(...skipping 29 matching lines...) Expand all Loading... |
40 scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue()); | 40 scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue()); |
41 record_data->SetInteger("frame_count", frame_count); | 41 record_data->SetInteger("frame_count", frame_count); |
42 record_data->SetDouble("rasterize_time", rasterize_time.InSecondsF()); | 42 record_data->SetDouble("rasterize_time", rasterize_time.InSecondsF()); |
43 record_data->SetInteger("rasterized_pixel_count", rasterized_pixel_count); | 43 record_data->SetInteger("rasterized_pixel_count", rasterized_pixel_count); |
44 return TracedValue::FromValue(record_data.release()); | 44 return TracedValue::FromValue(record_data.release()); |
45 } | 45 } |
46 | 46 |
47 void ImplThreadRenderingStats::Add(const ImplThreadRenderingStats& other) { | 47 void ImplThreadRenderingStats::Add(const ImplThreadRenderingStats& other) { |
48 frame_count += other.frame_count; | 48 frame_count += other.frame_count; |
49 rasterize_time += other.rasterize_time; | 49 rasterize_time += other.rasterize_time; |
| 50 analysis_time += other.analysis_time; |
50 rasterized_pixel_count += other.rasterized_pixel_count; | 51 rasterized_pixel_count += other.rasterized_pixel_count; |
51 } | 52 } |
52 | 53 |
53 void RenderingStats::EnumerateFields(Enumerator* enumerator) const { | 54 void RenderingStats::EnumerateFields(Enumerator* enumerator) const { |
54 enumerator->AddInt64("frameCount", | 55 enumerator->AddInt64("frameCount", |
55 main_stats.frame_count + impl_stats.frame_count); | 56 main_stats.frame_count + impl_stats.frame_count); |
56 enumerator->AddDouble("paintTime", | 57 enumerator->AddDouble("paintTime", |
57 main_stats.paint_time.InSecondsF()); | 58 main_stats.paint_time.InSecondsF()); |
58 enumerator->AddInt64("paintedPixelCount", | 59 enumerator->AddInt64("paintedPixelCount", |
59 main_stats.painted_pixel_count); | 60 main_stats.painted_pixel_count); |
60 enumerator->AddDouble("recordTime", | 61 enumerator->AddDouble("recordTime", |
61 main_stats.record_time.InSecondsF()); | 62 main_stats.record_time.InSecondsF()); |
62 enumerator->AddInt64("recordedPixelCount", | 63 enumerator->AddInt64("recordedPixelCount", |
63 main_stats.recorded_pixel_count); | 64 main_stats.recorded_pixel_count); |
| 65 // Combine rasterization and analysis time as a precursor to combining |
| 66 // them in the same step internally. |
64 enumerator->AddDouble("rasterizeTime", | 67 enumerator->AddDouble("rasterizeTime", |
65 impl_stats.rasterize_time.InSecondsF()); | 68 impl_stats.rasterize_time.InSecondsF() + |
| 69 impl_stats.analysis_time.InSecondsF()); |
66 enumerator->AddInt64("rasterizedPixelCount", | 70 enumerator->AddInt64("rasterizedPixelCount", |
67 impl_stats.rasterized_pixel_count); | 71 impl_stats.rasterized_pixel_count); |
68 } | 72 } |
69 | 73 |
70 void RenderingStats::Add(const RenderingStats& other) { | 74 void RenderingStats::Add(const RenderingStats& other) { |
71 main_stats.Add(other.main_stats); | 75 main_stats.Add(other.main_stats); |
72 impl_stats.Add(other.impl_stats); | 76 impl_stats.Add(other.impl_stats); |
73 } | 77 } |
74 | 78 |
75 } // namespace cc | 79 } // namespace cc |
OLD | NEW |