| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ | 5 #ifndef CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ |
| 6 #define CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ | 6 #define CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ |
| 7 | 7 |
| 8 #include "base/trace_event/trace_event.h" | 8 #include "base/trace_event/trace_event.h" |
| 9 #include "base/trace_event/trace_event_argument.h" | 9 #include "base/trace_event/trace_event_argument.h" |
| 10 | 10 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 } | 89 } |
| 90 ~ScopedCommitTrace() { | 90 ~ScopedCommitTrace() { |
| 91 TRACE_EVENT_END0(internal::kCategory, internal::kCompositeLayers); | 91 TRACE_EVENT_END0(internal::kCategory, internal::kCompositeLayers); |
| 92 } | 92 } |
| 93 | 93 |
| 94 private: | 94 private: |
| 95 DISALLOW_COPY_AND_ASSIGN(ScopedCommitTrace); | 95 DISALLOW_COPY_AND_ASSIGN(ScopedCommitTrace); |
| 96 }; | 96 }; |
| 97 | 97 |
| 98 struct ScopedLayerObjectTracker | 98 struct ScopedLayerObjectTracker |
| 99 : public base::debug::TraceScopedTrackableObject<int> { | 99 : public base::trace_event::TraceScopedTrackableObject<int> { |
| 100 explicit ScopedLayerObjectTracker(int layer_id) | 100 explicit ScopedLayerObjectTracker(int layer_id) |
| 101 : base::debug::TraceScopedTrackableObject<int>( | 101 : base::trace_event::TraceScopedTrackableObject<int>( |
| 102 internal::kCategory, | 102 internal::kCategory, |
| 103 internal::kLayerId, | 103 internal::kLayerId, |
| 104 layer_id) { | 104 layer_id) { |
| 105 } | 105 } |
| 106 | 106 |
| 107 private: | 107 private: |
| 108 DISALLOW_COPY_AND_ASSIGN(ScopedLayerObjectTracker); | 108 DISALLOW_COPY_AND_ASSIGN(ScopedLayerObjectTracker); |
| 109 }; | 109 }; |
| 110 | 110 |
| 111 inline void DidActivateLayerTree(int layer_tree_host_id, int frame_id) { | 111 inline void DidActivateLayerTree(int layer_tree_host_id, int frame_id) { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 135 } | 135 } |
| 136 | 136 |
| 137 inline void DidRequestMainThreadFrame(int layer_tree_host_id) { | 137 inline void DidRequestMainThreadFrame(int layer_tree_host_id) { |
| 138 TRACE_EVENT_INSTANT1(internal::kCategoryFrame, | 138 TRACE_EVENT_INSTANT1(internal::kCategoryFrame, |
| 139 internal::kRequestMainThreadFrame, | 139 internal::kRequestMainThreadFrame, |
| 140 TRACE_EVENT_SCOPE_THREAD, | 140 TRACE_EVENT_SCOPE_THREAD, |
| 141 internal::kLayerTreeId, | 141 internal::kLayerTreeId, |
| 142 layer_tree_host_id); | 142 layer_tree_host_id); |
| 143 } | 143 } |
| 144 | 144 |
| 145 inline scoped_refptr<base::debug::ConvertableToTraceFormat> | 145 inline scoped_refptr<base::trace_event::ConvertableToTraceFormat> |
| 146 BeginMainThreadFrameData(int frame_id) { | 146 BeginMainThreadFrameData(int frame_id) { |
| 147 scoped_refptr<base::debug::TracedValue> value = | 147 scoped_refptr<base::trace_event::TracedValue> value = |
| 148 new base::debug::TracedValue(); | 148 new base::trace_event::TracedValue(); |
| 149 value->SetInteger("frameId", frame_id); | 149 value->SetInteger("frameId", frame_id); |
| 150 return value; | 150 return value; |
| 151 } | 151 } |
| 152 | 152 |
| 153 inline void WillBeginMainThreadFrame(int layer_tree_host_id, int frame_id) { | 153 inline void WillBeginMainThreadFrame(int layer_tree_host_id, int frame_id) { |
| 154 TRACE_EVENT_INSTANT2( | 154 TRACE_EVENT_INSTANT2( |
| 155 internal::kCategoryFrame, internal::kBeginMainThreadFrame, | 155 internal::kCategoryFrame, internal::kBeginMainThreadFrame, |
| 156 TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id, | 156 TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id, |
| 157 internal::kData, BeginMainThreadFrameData(frame_id)); | 157 internal::kData, BeginMainThreadFrameData(frame_id)); |
| 158 } | 158 } |
| 159 | 159 |
| 160 } // namespace devtools_instrumentation | 160 } // namespace devtools_instrumentation |
| 161 } // namespace cc | 161 } // namespace cc |
| 162 | 162 |
| 163 #endif // CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ | 163 #endif // CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ |
| OLD | NEW |