Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Side by Side Diff: cc/debug/traced_value.h

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/debug/traced_picture.cc ('k') | cc/debug/traced_value.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_TRACED_VALUE_H_ 5 #ifndef CC_DEBUG_TRACED_VALUE_H_
6 #define CC_DEBUG_TRACED_VALUE_H_ 6 #define CC_DEBUG_TRACED_VALUE_H_
7 7
8 namespace base { 8 namespace base {
9 namespace trace_event { 9 namespace trace_event {
10 class TracedValue; 10 class TracedValue;
11 } 11 }
12
13 // TODO(ssid): remove these aliases after the tracing clients are moved to the
14 // new trace_event namespace. See crbug.com/451032. ETA: March 2015.
15 namespace debug {
16 using ::base::trace_event::TracedValue;
17 } 12 }
18 } // namespace base
19 13
20 namespace cc { 14 namespace cc {
21 15
22 class TracedValue { 16 class TracedValue {
23 public: 17 public:
24 static void AppendIDRef(const void* id, base::debug::TracedValue* array); 18 static void AppendIDRef(const void* id,
19 base::trace_event::TracedValue* array);
25 static void SetIDRef(const void* id, 20 static void SetIDRef(const void* id,
26 base::debug::TracedValue* dict, 21 base::trace_event::TracedValue* dict,
27 const char* name); 22 const char* name);
28 static void MakeDictIntoImplicitSnapshot(base::debug::TracedValue* dict, 23 static void MakeDictIntoImplicitSnapshot(base::trace_event::TracedValue* dict,
29 const char* object_name, 24 const char* object_name,
30 const void* id); 25 const void* id);
31 static void MakeDictIntoImplicitSnapshotWithCategory( 26 static void MakeDictIntoImplicitSnapshotWithCategory(
32 const char* category, 27 const char* category,
33 base::debug::TracedValue* dict, 28 base::trace_event::TracedValue* dict,
34 const char* object_name, 29 const char* object_name,
35 const void* id); 30 const void* id);
36 static void MakeDictIntoImplicitSnapshotWithCategory( 31 static void MakeDictIntoImplicitSnapshotWithCategory(
37 const char* category, 32 const char* category,
38 base::debug::TracedValue* dict, 33 base::trace_event::TracedValue* dict,
39 const char* object_base_type_name, 34 const char* object_base_type_name,
40 const char* object_name, 35 const char* object_name,
41 const void* id); 36 const void* id);
42 }; 37 };
43 38
44 } // namespace cc 39 } // namespace cc
45 40
46 #endif // CC_DEBUG_TRACED_VALUE_H_ 41 #endif // CC_DEBUG_TRACED_VALUE_H_
OLDNEW
« no previous file with comments | « cc/debug/traced_picture.cc ('k') | cc/debug/traced_value.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698