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

Unified Diff: third_party/WebKit/Source/platform/inspector_protocol/Values.cpp

Issue 1758313002: DevTools: introduce collections shim to be backed by non-wtf in v8_inspector. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for landing Created 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/inspector_protocol/Values.cpp
diff --git a/third_party/WebKit/Source/platform/inspector_protocol/Values.cpp b/third_party/WebKit/Source/platform/inspector_protocol/Values.cpp
index 88038c3615b0b8955d55a2db07767758ea9a18a9..4f7a6a427392cf5d00fa71368fddd46443c2975e 100644
--- a/third_party/WebKit/Source/platform/inspector_protocol/Values.cpp
+++ b/third_party/WebKit/Source/platform/inspector_protocol/Values.cpp
@@ -186,21 +186,21 @@ void DictionaryValue::setString(const String& name, const String& value)
void DictionaryValue::setValue(const String& name, PassOwnPtr<Value> value)
{
ASSERT(value);
- if (m_data.set(name, value).isNewEntry)
+ if (m_data.set(name, value))
m_order.append(name);
}
void DictionaryValue::setObject(const String& name, PassOwnPtr<DictionaryValue> value)
{
ASSERT(value);
- if (m_data.set(name, value).isNewEntry)
+ if (m_data.set(name, value))
m_order.append(name);
}
void DictionaryValue::setArray(const String& name, PassOwnPtr<ListValue> value)
{
ASSERT(value);
- if (m_data.set(name, value).isNewEntry)
+ if (m_data.set(name, value))
m_order.append(name);
}
@@ -235,7 +235,7 @@ protocol::Value* DictionaryValue::get(const String& name) const
Dictionary::const_iterator it = m_data.find(name);
if (it == m_data.end())
return nullptr;
- return it->value.get();
+ return it->second;
}
DictionaryValue::Entry DictionaryValue::at(size_t index) const
@@ -270,9 +270,9 @@ void DictionaryValue::writeJSON(StringBuilder* output) const
ASSERT_WITH_SECURITY_IMPLICATION(it != m_data.end());
if (i)
output->append(',');
- doubleQuoteStringForJSON(it->key, output);
+ doubleQuoteStringForJSON(it->first, output);
output->append(':');
- it->value->writeJSON(output);
+ it->second->writeJSON(output);
}
output->append('}');
}
@@ -281,17 +281,16 @@ PassOwnPtr<Value> DictionaryValue::clone() const
{
OwnPtr<DictionaryValue> result = DictionaryValue::create();
for (size_t i = 0; i < m_order.size(); ++i) {
- Dictionary::const_iterator it = m_data.find(m_order[i]);
- ASSERT(it != m_data.end());
- result->setValue(it->key, it->value->clone());
+ String key = m_order[i];
+ Value* value = m_data.get(key);
+ ASSERT(value);
+ result->setValue(key, value->clone());
}
return result.release();
}
DictionaryValue::DictionaryValue()
: Value(TypeObject)
- , m_data()
- , m_order()
{
}
@@ -320,7 +319,6 @@ PassOwnPtr<Value> ListValue::clone() const
ListValue::ListValue()
: Value(TypeArray)
- , m_data()
{
}

Powered by Google App Engine
This is Rietveld 408576698