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

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

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://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.h ('k') | cc/input/input_handler.h » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "cc/debug/traced_value.h" 5 #include "cc/debug/traced_value.h"
6 6
7 #include "base/debug/trace_event_argument.h"
8 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/trace_event/trace_event_argument.h"
9 9
10 namespace cc { 10 namespace cc {
11 11
12 void TracedValue::AppendIDRef(const void* id, base::debug::TracedValue* state) { 12 void TracedValue::AppendIDRef(const void* id, base::debug::TracedValue* state) {
13 state->BeginDictionary(); 13 state->BeginDictionary();
14 state->SetString("id_ref", base::StringPrintf("%p", id)); 14 state->SetString("id_ref", base::StringPrintf("%p", id));
15 state->EndDictionary(); 15 state->EndDictionary();
16 } 16 }
17 17
18 void TracedValue::SetIDRef(const void* id, 18 void TracedValue::SetIDRef(const void* id,
(...skipping 24 matching lines...) Expand all
43 base::debug::TracedValue* dict, 43 base::debug::TracedValue* dict,
44 const char* object_base_type_name, 44 const char* object_base_type_name,
45 const char* object_name, 45 const char* object_name,
46 const void* id) { 46 const void* id) {
47 dict->SetString("cat", category); 47 dict->SetString("cat", category);
48 dict->SetString("base_type", object_base_type_name); 48 dict->SetString("base_type", object_base_type_name);
49 MakeDictIntoImplicitSnapshot(dict, object_name, id); 49 MakeDictIntoImplicitSnapshot(dict, object_name, id);
50 } 50 }
51 51
52 } // namespace cc 52 } // namespace cc
OLDNEW
« no previous file with comments | « cc/debug/traced_picture.h ('k') | cc/input/input_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698