Index: third_party/WebKit/Source/platform/inspector_protocol/TypeBuilder_cpp.template |
diff --git a/third_party/WebKit/Source/platform/inspector_protocol/TypeBuilder_cpp.template b/third_party/WebKit/Source/platform/inspector_protocol/TypeBuilder_cpp.template |
index 909fea4e71a7ff277ec21b061f6d1d36941ee930..f1a252cc904890225326d3965e6d8b7f0830bc8f 100644 |
--- a/third_party/WebKit/Source/platform/inspector_protocol/TypeBuilder_cpp.template |
+++ b/third_party/WebKit/Source/platform/inspector_protocol/TypeBuilder_cpp.template |
@@ -49,11 +49,11 @@ std::unique_ptr<{{type.id}}> {{type.id}}::parse(protocol::Value* value, ErrorSup |
{% if property.optional %} |
if ({{property.name}}Value) { |
errors->setName("{{property.name}}"); |
- result->m_{{property.name}} = FromValue<{{resolve_type(property).raw_type}}>::parse({{property.name}}Value, errors); |
+ result->m_{{property.name}} = ValueConversions<{{resolve_type(property).raw_type}}>::parse({{property.name}}Value, errors); |
} |
{% else %} |
errors->setName("{{property.name}}"); |
- result->m_{{property.name}} = FromValue<{{resolve_type(property).raw_type}}>::parse({{property.name}}Value, errors); |
+ result->m_{{property.name}} = ValueConversions<{{resolve_type(property).raw_type}}>::parse({{property.name}}Value, errors); |
{% endif %} |
{% endfor %} |
errors->pop(); |
@@ -68,9 +68,9 @@ std::unique_ptr<protocol::DictionaryValue> {{type.id}}::serialize() const |
{% for property in type.properties %} |
{% if property.optional %} |
if (m_{{property.name}}.isJust()) |
- result->setValue("{{property.name}}", toValue(m_{{property.name}}.fromJust())); |
+ result->setValue("{{property.name}}", ValueConversions<{{resolve_type(property).raw_type}}>::serialize(m_{{property.name}}.fromJust())); |
{% else %} |
- result->setValue("{{property.name}}", toValue({{resolve_type(property).to_raw_type % ("m_" + property.name)}})); |
+ result->setValue("{{property.name}}", ValueConversions<{{resolve_type(property).raw_type}}>::serialize({{resolve_type(property).to_raw_type % ("m_" + property.name)}})); |
{% endif %} |
{% endfor %} |
return result; |
@@ -119,9 +119,9 @@ void Frontend::{{event.name}}( |
{% for parameter in event.parameters %} |
{% if "optional" in parameter %} |
if ({{parameter.name}}.isJust()) |
- paramsObject->setValue("{{parameter.name}}", toValue({{parameter.name}}.fromJust())); |
+ paramsObject->setValue("{{parameter.name}}", ValueConversions<{{resolve_type(parameter).raw_type}}>::serialize({{parameter.name}}.fromJust())); |
{% else %} |
- paramsObject->setValue("{{parameter.name}}", toValue({{resolve_type(parameter).to_raw_type % parameter.name}})); |
+ paramsObject->setValue("{{parameter.name}}", ValueConversions<{{resolve_type(parameter).raw_type}}>::serialize({{resolve_type(parameter).to_raw_type % parameter.name}})); |
{% endif %} |
{% endfor %} |
jsonMessage->setObject("params", std::move(paramsObject)); |
@@ -196,9 +196,9 @@ public: |
{% for parameter in command.returns %} |
{% if "optional" in parameter %} |
if ({{parameter.name}}.isJust()) |
- resultObject->setValue("{{parameter.name}}", toValue({{parameter.name}}.fromJust())); |
+ resultObject->setValue("{{parameter.name}}", ValueConversions<{{resolve_type(parameter).raw_type}}>::serialize({{parameter.name}}.fromJust())); |
{% else %} |
- resultObject->setValue("{{parameter.name}}", toValue({{resolve_type(parameter).to_raw_type % parameter.name}})); |
+ resultObject->setValue("{{parameter.name}}", ValueConversions<{{resolve_type(parameter).raw_type}}>::serialize({{resolve_type(parameter).to_raw_type % parameter.name}})); |
{% endif %} |
{% endfor %} |
sendIfActive(std::move(resultObject), ErrorString()); |
@@ -225,11 +225,11 @@ void DispatcherImpl::{{command.name}}(int callId, std::unique_ptr<DictionaryValu |
Maybe<{{resolve_type(property).raw_type}}> in_{{property.name}}; |
if ({{property.name}}Value) { |
errors->setName("{{property.name}}"); |
- in_{{property.name}} = FromValue<{{resolve_type(property).raw_type}}>::parse({{property.name}}Value, errors); |
+ in_{{property.name}} = ValueConversions<{{resolve_type(property).raw_type}}>::parse({{property.name}}Value, errors); |
} |
{% else %} |
errors->setName("{{property.name}}"); |
- {{resolve_type(property).type}} in_{{property.name}} = FromValue<{{resolve_type(property).raw_type}}>::parse({{property.name}}Value, errors); |
+ {{resolve_type(property).type}} in_{{property.name}} = ValueConversions<{{resolve_type(property).raw_type}}>::parse({{property.name}}Value, errors); |
{% endif %} |
{% endfor %} |
errors->pop(); |
@@ -274,9 +274,9 @@ void DispatcherImpl::{{command.name}}(int callId, std::unique_ptr<DictionaryValu |
{% for parameter in command.returns %} |
{% if "optional" in parameter %} |
if (out_{{parameter.name}}.isJust()) |
- result->setValue("{{parameter.name}}", toValue(out_{{parameter.name}}.fromJust())); |
+ result->setValue("{{parameter.name}}", ValueConversions<{{resolve_type(parameter).raw_type}}>::serialize(out_{{parameter.name}}.fromJust())); |
{% else %} |
- result->setValue("{{parameter.name}}", toValue({{resolve_type(parameter).to_raw_type % ("out_" + parameter.name)}})); |
+ result->setValue("{{parameter.name}}", ValueConversions<{{resolve_type(parameter).raw_type}}>::serialize({{resolve_type(parameter).to_raw_type % ("out_" + parameter.name)}})); |
{% endif %} |
{% endfor %} |
} |