| 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 <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 } | 140 } |
| 141 | 141 |
| 142 inline void DidRequestMainThreadFrame(int layer_tree_host_id) { | 142 inline void DidRequestMainThreadFrame(int layer_tree_host_id) { |
| 143 TRACE_EVENT_INSTANT1(internal::kCategoryFrame, | 143 TRACE_EVENT_INSTANT1(internal::kCategoryFrame, |
| 144 internal::kRequestMainThreadFrame, | 144 internal::kRequestMainThreadFrame, |
| 145 TRACE_EVENT_SCOPE_THREAD, | 145 TRACE_EVENT_SCOPE_THREAD, |
| 146 internal::kLayerTreeId, | 146 internal::kLayerTreeId, |
| 147 layer_tree_host_id); | 147 layer_tree_host_id); |
| 148 } | 148 } |
| 149 | 149 |
| 150 inline scoped_refptr<base::trace_event::ConvertableToTraceFormat> | 150 inline scoped_ptr<base::trace_event::ConvertableToTraceFormat> |
| 151 BeginMainThreadFrameData(int frame_id) { | 151 BeginMainThreadFrameData(int frame_id) { |
| 152 scoped_refptr<base::trace_event::TracedValue> value = | 152 auto value = make_scoped_ptr(new base::trace_event::TracedValue()); |
| 153 new base::trace_event::TracedValue(); | |
| 154 value->SetInteger("frameId", frame_id); | 153 value->SetInteger("frameId", frame_id); |
| 155 return value; | 154 return std::move(value); |
| 156 } | 155 } |
| 157 | 156 |
| 158 inline void WillBeginMainThreadFrame(int layer_tree_host_id, int frame_id) { | 157 inline void WillBeginMainThreadFrame(int layer_tree_host_id, int frame_id) { |
| 159 TRACE_EVENT_INSTANT2( | 158 TRACE_EVENT_INSTANT2( |
| 160 internal::kCategoryFrame, internal::kBeginMainThreadFrame, | 159 internal::kCategoryFrame, internal::kBeginMainThreadFrame, |
| 161 TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id, | 160 TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id, |
| 162 internal::kData, BeginMainThreadFrameData(frame_id)); | 161 internal::kData, BeginMainThreadFrameData(frame_id)); |
| 163 } | 162 } |
| 164 | 163 |
| 165 inline scoped_refptr<base::trace_event::ConvertableToTraceFormat> | 164 inline scoped_ptr<base::trace_event::ConvertableToTraceFormat> |
| 166 NeedsBeginFrameData(bool needs_begin_frame) { | 165 NeedsBeginFrameData(bool needs_begin_frame) { |
| 167 scoped_refptr<base::trace_event::TracedValue> value = | 166 auto value = make_scoped_ptr(new base::trace_event::TracedValue()); |
| 168 new base::trace_event::TracedValue(); | |
| 169 value->SetInteger("needsBeginFrame", needs_begin_frame); | 167 value->SetInteger("needsBeginFrame", needs_begin_frame); |
| 170 return value; | 168 return std::move(value); |
| 171 } | 169 } |
| 172 | 170 |
| 173 inline void NeedsBeginFrameChanged(int layer_tree_host_id, bool new_value) { | 171 inline void NeedsBeginFrameChanged(int layer_tree_host_id, bool new_value) { |
| 174 TRACE_EVENT_INSTANT2( | 172 TRACE_EVENT_INSTANT2( |
| 175 internal::kCategoryFrame, internal::kNeedsBeginFrameChanged, | 173 internal::kCategoryFrame, internal::kNeedsBeginFrameChanged, |
| 176 TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id, | 174 TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id, |
| 177 internal::kData, NeedsBeginFrameData(new_value)); | 175 internal::kData, NeedsBeginFrameData(new_value)); |
| 178 } | 176 } |
| 179 | 177 |
| 180 } // namespace devtools_instrumentation | 178 } // namespace devtools_instrumentation |
| 181 } // namespace cc | 179 } // namespace cc |
| 182 | 180 |
| 183 #endif // CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ | 181 #endif // CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ |
| OLD | NEW |