744b49ef0d
This roll includes: - [inspector_protocol] fixed compatibility with latest jinja 2.9.6 - [inspector_protocol] removed unused variable - Follow up on alph's review comments. - Provide default escape implementation for latin and wide strings. - Allow escaping utf8 strings in embedders that operate std::string. - Upload inspector_protocol changes to Gerrit by default - [inspector_protocol] Fix building with non-ASCII paths - [inspector_protocol] added StringUtil::toDouble method as requirement - Add const char* overloads to ErrorSupport BUG=chromium:743313 R=dgozman@chromium.org Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel Change-Id: Ic81a62c638bf592ae65c84055d53d926e50715ac Reviewed-on: https://chromium-review.googlesource.com/713538 Reviewed-by: Dmitry Gozman <dgozman@chromium.org> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org> Cr-Commit-Position: refs/heads/master@{#48477}
410 lines
9.9 KiB
Plaintext
410 lines
9.9 KiB
Plaintext
// Copyright 2016 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
//#include "Values.h"
|
|
|
|
{% for namespace in config.protocol.namespace %}
|
|
namespace {{namespace}} {
|
|
{% endfor %}
|
|
|
|
namespace {
|
|
|
|
const char* const nullValueString = "null";
|
|
const char* const trueValueString = "true";
|
|
const char* const falseValueString = "false";
|
|
|
|
inline bool escapeChar(uint16_t c, StringBuilder* dst)
|
|
{
|
|
switch (c) {
|
|
case '\b': StringUtil::builderAppend(*dst, "\\b"); break;
|
|
case '\f': StringUtil::builderAppend(*dst, "\\f"); break;
|
|
case '\n': StringUtil::builderAppend(*dst, "\\n"); break;
|
|
case '\r': StringUtil::builderAppend(*dst, "\\r"); break;
|
|
case '\t': StringUtil::builderAppend(*dst, "\\t"); break;
|
|
case '\\': StringUtil::builderAppend(*dst, "\\\\"); break;
|
|
case '"': StringUtil::builderAppend(*dst, "\\\""); break;
|
|
default:
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
const char hexDigits[17] = "0123456789ABCDEF";
|
|
|
|
void appendUnsignedAsHex(uint16_t number, StringBuilder* dst)
|
|
{
|
|
StringUtil::builderAppend(*dst, "\\u");
|
|
for (size_t i = 0; i < 4; ++i) {
|
|
uint16_t c = hexDigits[(number & 0xF000) >> 12];
|
|
StringUtil::builderAppend(*dst, c);
|
|
number <<= 4;
|
|
}
|
|
}
|
|
|
|
template <typename Char>
|
|
void escapeStringForJSONInternal(const Char* str, unsigned len,
|
|
StringBuilder* dst)
|
|
{
|
|
for (unsigned i = 0; i < len; ++i) {
|
|
Char c = str[i];
|
|
if (escapeChar(c, dst))
|
|
continue;
|
|
if (c < 32 || c > 126) {
|
|
appendUnsignedAsHex(c, dst);
|
|
} else {
|
|
StringUtil::builderAppend(*dst, c);
|
|
}
|
|
}
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
bool Value::asBoolean(bool*) const
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool Value::asDouble(double*) const
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool Value::asInteger(int*) const
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool Value::asString(String*) const
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool Value::asSerialized(String*) const
|
|
{
|
|
return false;
|
|
}
|
|
|
|
void Value::writeJSON(StringBuilder* output) const
|
|
{
|
|
DCHECK(m_type == TypeNull);
|
|
StringUtil::builderAppend(*output, nullValueString, 4);
|
|
}
|
|
|
|
std::unique_ptr<Value> Value::clone() const
|
|
{
|
|
return Value::null();
|
|
}
|
|
|
|
String Value::serialize()
|
|
{
|
|
StringBuilder result;
|
|
StringUtil::builderReserve(result, 512);
|
|
writeJSON(&result);
|
|
return StringUtil::builderToString(result);
|
|
}
|
|
|
|
bool FundamentalValue::asBoolean(bool* output) const
|
|
{
|
|
if (type() != TypeBoolean)
|
|
return false;
|
|
*output = m_boolValue;
|
|
return true;
|
|
}
|
|
|
|
bool FundamentalValue::asDouble(double* output) const
|
|
{
|
|
if (type() == TypeDouble) {
|
|
*output = m_doubleValue;
|
|
return true;
|
|
}
|
|
if (type() == TypeInteger) {
|
|
*output = m_integerValue;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool FundamentalValue::asInteger(int* output) const
|
|
{
|
|
if (type() != TypeInteger)
|
|
return false;
|
|
*output = m_integerValue;
|
|
return true;
|
|
}
|
|
|
|
void FundamentalValue::writeJSON(StringBuilder* output) const
|
|
{
|
|
DCHECK(type() == TypeBoolean || type() == TypeInteger || type() == TypeDouble);
|
|
if (type() == TypeBoolean) {
|
|
if (m_boolValue)
|
|
StringUtil::builderAppend(*output, trueValueString, 4);
|
|
else
|
|
StringUtil::builderAppend(*output, falseValueString, 5);
|
|
} else if (type() == TypeDouble) {
|
|
if (!std::isfinite(m_doubleValue)) {
|
|
StringUtil::builderAppend(*output, nullValueString, 4);
|
|
return;
|
|
}
|
|
StringUtil::builderAppend(*output, StringUtil::fromDouble(m_doubleValue));
|
|
} else if (type() == TypeInteger) {
|
|
StringUtil::builderAppend(*output, StringUtil::fromInteger(m_integerValue));
|
|
}
|
|
}
|
|
|
|
std::unique_ptr<Value> FundamentalValue::clone() const
|
|
{
|
|
switch (type()) {
|
|
case TypeDouble: return FundamentalValue::create(m_doubleValue);
|
|
case TypeInteger: return FundamentalValue::create(m_integerValue);
|
|
case TypeBoolean: return FundamentalValue::create(m_boolValue);
|
|
default:
|
|
DCHECK(false);
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
bool StringValue::asString(String* output) const
|
|
{
|
|
*output = m_stringValue;
|
|
return true;
|
|
}
|
|
|
|
void StringValue::writeJSON(StringBuilder* output) const
|
|
{
|
|
DCHECK(type() == TypeString);
|
|
StringUtil::builderAppendQuotedString(*output, m_stringValue);
|
|
}
|
|
|
|
std::unique_ptr<Value> StringValue::clone() const
|
|
{
|
|
return StringValue::create(m_stringValue);
|
|
}
|
|
|
|
bool SerializedValue::asSerialized(String* output) const
|
|
{
|
|
*output = m_serializedValue;
|
|
return true;
|
|
}
|
|
|
|
void SerializedValue::writeJSON(StringBuilder* output) const
|
|
{
|
|
DCHECK(type() == TypeSerialized);
|
|
StringUtil::builderAppend(*output, m_serializedValue);
|
|
}
|
|
|
|
std::unique_ptr<Value> SerializedValue::clone() const
|
|
{
|
|
return SerializedValue::create(m_serializedValue);
|
|
}
|
|
|
|
DictionaryValue::~DictionaryValue()
|
|
{
|
|
}
|
|
|
|
void DictionaryValue::setBoolean(const String& name, bool value)
|
|
{
|
|
setValue(name, FundamentalValue::create(value));
|
|
}
|
|
|
|
void DictionaryValue::setInteger(const String& name, int value)
|
|
{
|
|
setValue(name, FundamentalValue::create(value));
|
|
}
|
|
|
|
void DictionaryValue::setDouble(const String& name, double value)
|
|
{
|
|
setValue(name, FundamentalValue::create(value));
|
|
}
|
|
|
|
void DictionaryValue::setString(const String& name, const String& value)
|
|
{
|
|
setValue(name, StringValue::create(value));
|
|
}
|
|
|
|
void DictionaryValue::setValue(const String& name, std::unique_ptr<Value> value)
|
|
{
|
|
set(name, value);
|
|
}
|
|
|
|
void DictionaryValue::setObject(const String& name, std::unique_ptr<DictionaryValue> value)
|
|
{
|
|
set(name, value);
|
|
}
|
|
|
|
void DictionaryValue::setArray(const String& name, std::unique_ptr<ListValue> value)
|
|
{
|
|
set(name, value);
|
|
}
|
|
|
|
bool DictionaryValue::getBoolean(const String& name, bool* output) const
|
|
{
|
|
protocol::Value* value = get(name);
|
|
if (!value)
|
|
return false;
|
|
return value->asBoolean(output);
|
|
}
|
|
|
|
bool DictionaryValue::getInteger(const String& name, int* output) const
|
|
{
|
|
Value* value = get(name);
|
|
if (!value)
|
|
return false;
|
|
return value->asInteger(output);
|
|
}
|
|
|
|
bool DictionaryValue::getDouble(const String& name, double* output) const
|
|
{
|
|
Value* value = get(name);
|
|
if (!value)
|
|
return false;
|
|
return value->asDouble(output);
|
|
}
|
|
|
|
bool DictionaryValue::getString(const String& name, String* output) const
|
|
{
|
|
protocol::Value* value = get(name);
|
|
if (!value)
|
|
return false;
|
|
return value->asString(output);
|
|
}
|
|
|
|
DictionaryValue* DictionaryValue::getObject(const String& name) const
|
|
{
|
|
return DictionaryValue::cast(get(name));
|
|
}
|
|
|
|
protocol::ListValue* DictionaryValue::getArray(const String& name) const
|
|
{
|
|
return ListValue::cast(get(name));
|
|
}
|
|
|
|
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->second.get();
|
|
}
|
|
|
|
DictionaryValue::Entry DictionaryValue::at(size_t index) const
|
|
{
|
|
const String key = m_order[index];
|
|
return std::make_pair(key, m_data.find(key)->second.get());
|
|
}
|
|
|
|
bool DictionaryValue::booleanProperty(const String& name, bool defaultValue) const
|
|
{
|
|
bool result = defaultValue;
|
|
getBoolean(name, &result);
|
|
return result;
|
|
}
|
|
|
|
int DictionaryValue::integerProperty(const String& name, int defaultValue) const
|
|
{
|
|
int result = defaultValue;
|
|
getInteger(name, &result);
|
|
return result;
|
|
}
|
|
|
|
double DictionaryValue::doubleProperty(const String& name, double defaultValue) const
|
|
{
|
|
double result = defaultValue;
|
|
getDouble(name, &result);
|
|
return result;
|
|
}
|
|
|
|
void DictionaryValue::remove(const String& name)
|
|
{
|
|
m_data.erase(name);
|
|
m_order.erase(std::remove(m_order.begin(), m_order.end(), name), m_order.end());
|
|
}
|
|
|
|
void DictionaryValue::writeJSON(StringBuilder* output) const
|
|
{
|
|
StringUtil::builderAppend(*output, '{');
|
|
for (size_t i = 0; i < m_order.size(); ++i) {
|
|
Dictionary::const_iterator it = m_data.find(m_order[i]);
|
|
CHECK(it != m_data.end());
|
|
if (i)
|
|
StringUtil::builderAppend(*output, ',');
|
|
StringUtil::builderAppendQuotedString(*output, it->first);
|
|
StringUtil::builderAppend(*output, ':');
|
|
it->second->writeJSON(output);
|
|
}
|
|
StringUtil::builderAppend(*output, '}');
|
|
}
|
|
|
|
std::unique_ptr<Value> DictionaryValue::clone() const
|
|
{
|
|
std::unique_ptr<DictionaryValue> result = DictionaryValue::create();
|
|
for (size_t i = 0; i < m_order.size(); ++i) {
|
|
String key = m_order[i];
|
|
Dictionary::const_iterator value = m_data.find(key);
|
|
DCHECK(value != m_data.cend() && value->second);
|
|
result->setValue(key, value->second->clone());
|
|
}
|
|
return std::move(result);
|
|
}
|
|
|
|
DictionaryValue::DictionaryValue()
|
|
: Value(TypeObject)
|
|
{
|
|
}
|
|
|
|
ListValue::~ListValue()
|
|
{
|
|
}
|
|
|
|
void ListValue::writeJSON(StringBuilder* output) const
|
|
{
|
|
StringUtil::builderAppend(*output, '[');
|
|
bool first = true;
|
|
for (const std::unique_ptr<protocol::Value>& value : m_data) {
|
|
if (!first)
|
|
StringUtil::builderAppend(*output, ',');
|
|
value->writeJSON(output);
|
|
first = false;
|
|
}
|
|
StringUtil::builderAppend(*output, ']');
|
|
}
|
|
|
|
std::unique_ptr<Value> ListValue::clone() const
|
|
{
|
|
std::unique_ptr<ListValue> result = ListValue::create();
|
|
for (const std::unique_ptr<protocol::Value>& value : m_data)
|
|
result->pushValue(value->clone());
|
|
return std::move(result);
|
|
}
|
|
|
|
ListValue::ListValue()
|
|
: Value(TypeArray)
|
|
{
|
|
}
|
|
|
|
void ListValue::pushValue(std::unique_ptr<protocol::Value> value)
|
|
{
|
|
DCHECK(value);
|
|
m_data.push_back(std::move(value));
|
|
}
|
|
|
|
protocol::Value* ListValue::at(size_t index)
|
|
{
|
|
DCHECK_LT(index, m_data.size());
|
|
return m_data[index].get();
|
|
}
|
|
|
|
void escapeLatinStringForJSON(const uint8_t* str, unsigned len, StringBuilder* dst)
|
|
{
|
|
escapeStringForJSONInternal<uint8_t>(str, len, dst);
|
|
}
|
|
|
|
void escapeWideStringForJSON(const uint16_t* str, unsigned len, StringBuilder* dst)
|
|
{
|
|
escapeStringForJSONInternal<uint16_t>(str, len, dst);
|
|
}
|
|
|
|
{% for namespace in config.protocol.namespace %}
|
|
} // namespace {{namespace}}
|
|
{% endfor %}
|