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

Unified Diff: base/trace_event/trace_event_argument.cc

Issue 1354493003: [tracing] Don't use dot-based path expansion in TracedValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cc display list tracing Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/trace_event/trace_event_argument_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/trace_event_argument.cc
diff --git a/base/trace_event/trace_event_argument.cc b/base/trace_event/trace_event_argument.cc
index f77209d9493ada951dfb79da72c9428498011e7b..81b6ce039f538c0121ba7713125acbc4d6af995e 100644
--- a/base/trace_event/trace_event_argument.cc
+++ b/base/trace_event/trace_event_argument.cc
@@ -357,7 +357,8 @@ scoped_ptr<base::Value> TracedValue::ToBaseValue() const {
case kTypeStartDict: {
auto new_dict = new DictionaryValue();
if (cur_dict) {
- cur_dict->Set(ReadKeyName(it), make_scoped_ptr(new_dict));
+ cur_dict->SetWithoutPathExpansion(ReadKeyName(it),
+ make_scoped_ptr(new_dict));
stack.push_back(cur_dict);
cur_dict = new_dict;
} else {
@@ -381,7 +382,8 @@ scoped_ptr<base::Value> TracedValue::ToBaseValue() const {
case kTypeStartArray: {
auto new_list = new ListValue();
if (cur_dict) {
- cur_dict->Set(ReadKeyName(it), make_scoped_ptr(new_list));
+ cur_dict->SetWithoutPathExpansion(ReadKeyName(it),
+ make_scoped_ptr(new_list));
stack.push_back(cur_dict);
cur_dict = nullptr;
cur_list = new_list;
@@ -396,7 +398,7 @@ scoped_ptr<base::Value> TracedValue::ToBaseValue() const {
bool value;
CHECK(it.ReadBool(&value));
if (cur_dict) {
- cur_dict->SetBoolean(ReadKeyName(it), value);
+ cur_dict->SetBooleanWithoutPathExpansion(ReadKeyName(it), value);
} else {
cur_list->AppendBoolean(value);
}
@@ -406,7 +408,7 @@ scoped_ptr<base::Value> TracedValue::ToBaseValue() const {
int value;
CHECK(it.ReadInt(&value));
if (cur_dict) {
- cur_dict->SetInteger(ReadKeyName(it), value);
+ cur_dict->SetIntegerWithoutPathExpansion(ReadKeyName(it), value);
} else {
cur_list->AppendInteger(value);
}
@@ -416,7 +418,7 @@ scoped_ptr<base::Value> TracedValue::ToBaseValue() const {
double value;
CHECK(it.ReadDouble(&value));
if (cur_dict) {
- cur_dict->SetDouble(ReadKeyName(it), value);
+ cur_dict->SetDoubleWithoutPathExpansion(ReadKeyName(it), value);
} else {
cur_list->AppendDouble(value);
}
@@ -426,7 +428,7 @@ scoped_ptr<base::Value> TracedValue::ToBaseValue() const {
std::string value;
CHECK(it.ReadString(&value));
if (cur_dict) {
- cur_dict->SetString(ReadKeyName(it), value);
+ cur_dict->SetStringWithoutPathExpansion(ReadKeyName(it), value);
} else {
cur_list->AppendString(value);
}
« no previous file with comments | « no previous file | base/trace_event/trace_event_argument_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698