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

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

Issue 2001893002: DevTools: expose raw pointers in protocol collections, s/ASSERT/DCHECK/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 0471d901ee5a82acaad94100cc0b0797663ba6f6..c889039845b1324dbc535388395239359d8b5a16 100644
--- a/third_party/WebKit/Source/platform/inspector_protocol/Values.cpp
+++ b/third_party/WebKit/Source/platform/inspector_protocol/Values.cpp
@@ -100,7 +100,7 @@ String16 Value::toJSONString() const
void Value::writeJSON(String16Builder* output) const
{
- ASSERT(m_type == TypeNull);
+ DCHECK(m_type == TypeNull);
output->append(nullString, 4);
}
@@ -135,7 +135,7 @@ bool FundamentalValue::asNumber(int* output) const
void FundamentalValue::writeJSON(String16Builder* output) const
{
- ASSERT(type() == TypeBoolean || type() == TypeNumber);
+ DCHECK(type() == TypeBoolean || type() == TypeNumber);
if (type() == TypeBoolean) {
if (m_boolValue)
output->append(trueString, 4);
@@ -163,7 +163,7 @@ bool StringValue::asString(String16* output) const
void StringValue::writeJSON(String16Builder* output) const
{
- ASSERT(type() == TypeString);
+ DCHECK(type() == TypeString);
doubleQuoteStringForJSON(m_stringValue, output);
}
@@ -193,21 +193,21 @@ void DictionaryValue::setString(const String16& name, const String16& value)
void DictionaryValue::setValue(const String16& name, PassOwnPtr<Value> value)
{
- ASSERT(value);
+ DCHECK(value);
if (m_data.set(name, std::move(value)))
m_order.append(name);
}
void DictionaryValue::setObject(const String16& name, PassOwnPtr<DictionaryValue> value)
{
- ASSERT(value);
+ DCHECK(value);
if (m_data.set(name, std::move(value)))
m_order.append(name);
}
void DictionaryValue::setArray(const String16& name, PassOwnPtr<ListValue> value)
{
- ASSERT(value);
+ DCHECK(value);
if (m_data.set(name, std::move(value)))
m_order.append(name);
}
@@ -282,7 +282,7 @@ void DictionaryValue::writeJSON(String16Builder* output) const
output->append('{');
for (size_t i = 0; i < m_order.size(); ++i) {
Dictionary::const_iterator it = m_data.find(m_order[i]);
- ASSERT_WITH_SECURITY_IMPLICATION(it != m_data.end());
+ CHECK(it != m_data.end());
if (i)
output->append(',');
doubleQuoteStringForJSON(it->first, output);
@@ -298,7 +298,7 @@ PassOwnPtr<Value> DictionaryValue::clone() const
for (size_t i = 0; i < m_order.size(); ++i) {
String16 key = m_order[i];
Value* value = m_data.get(key);
- ASSERT(value);
+ DCHECK(value);
result->setValue(key, value->clone());
}
return std::move(result);
@@ -339,14 +339,14 @@ ListValue::ListValue()
void ListValue::pushValue(PassOwnPtr<protocol::Value> value)
{
- ASSERT(value);
+ DCHECK(value);
m_data.append(std::move(value));
}
protocol::Value* ListValue::at(size_t index)
{
ASSERT_WITH_SECURITY_IMPLICATION(index < m_data.size());
- return m_data[index].get();
+ return m_data[index];
}
} // namespace protocol

Powered by Google App Engine
This is Rietveld 408576698