| Index: third_party/WebKit/Source/platform/inspector_protocol/Imported_h.template
|
| diff --git a/third_party/WebKit/Source/platform/inspector_protocol/Imported_h.template b/third_party/WebKit/Source/platform/inspector_protocol/Imported_h.template
|
| index 2d4e11a469080752a67833f07bc6588efe7c2ea2..afd9ce79e6aab6803aca85206151f0357a2f65d4 100644
|
| --- a/third_party/WebKit/Source/platform/inspector_protocol/Imported_h.template
|
| +++ b/third_party/WebKit/Source/platform/inspector_protocol/Imported_h.template
|
| @@ -4,44 +4,48 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef protocol_{{domain.domain}}_imported_h
|
| -#define protocol_{{domain.domain}}_imported_h
|
| +#ifndef {{"_".join(config.protocol.namespace)}}_{{domain.domain}}_imported_h
|
| +#define {{"_".join(config.protocol.namespace)}}_{{domain.domain}}_imported_h
|
|
|
| -#include "{{config.lib_package}}/InspectorProtocol.h"
|
| +#include "{{config.protocol.package}}/Protocol.h"
|
| #include "{{config.imported.package}}/{{domain.domain}}.h"
|
|
|
| -namespace blink {
|
| -namespace protocol {
|
| +{% for namespace in config.protocol.namespace %}
|
| +namespace {{namespace}} {
|
| +{% endfor %}
|
| {% for type in domain.types %}
|
| {% if not (type.type == "object") or not ("properties" in type) or not (type.exported) %}{% continue %}{% endif %}
|
|
|
| template<>
|
| -struct ValueConversions<{{domain.domain}}::API::{{type.id}}> {
|
| - static std::unique_ptr<{{domain.domain}}::API::{{type.id}}> parse(protocol::Value* value, ErrorSupport* errors)
|
| +struct ValueConversions<{{"::".join(config.imported.namespace)}}::{{domain.domain}}::API::{{type.id}}> {
|
| + static std::unique_ptr<{{"::".join(config.imported.namespace)}}::{{domain.domain}}::API::{{type.id}}> parse(protocol::Value* value, ErrorSupport* errors)
|
| {
|
| if (!value) {
|
| errors->addError("value expected");
|
| return nullptr;
|
| }
|
| - std::unique_ptr<{{domain.domain}}::API::{{type.id}}> result = {{domain.domain}}::API::{{type.id}}::fromJSONString(value->toJSONString());
|
| + String json = value->toJSONString();
|
| + auto result = {{"::".join(config.imported.namespace)}}::{{domain.domain}}::API::{{type.id}}::fromJSONString({{config.imported.to_imported_string % "json"}});
|
| if (!result)
|
| errors->addError("cannot parse");
|
| return result;
|
| }
|
|
|
| - static std::unique_ptr<protocol::Value> serialize({{domain.domain}}::API::{{type.id}}* value)
|
| + static std::unique_ptr<protocol::Value> serialize(const {{"::".join(config.imported.namespace)}}::{{domain.domain}}::API::{{type.id}}* value)
|
| {
|
| - return SerializedValue::create(value->toJSONString());
|
| + auto json = value->toJSONString();
|
| + return SerializedValue::create({{config.imported.from_imported_string % "std::move(json)"}});
|
| }
|
|
|
| - static std::unique_ptr<protocol::Value> serialize(const std::unique_ptr<{{domain.domain}}::API::{{type.id}}>& value)
|
| + static std::unique_ptr<protocol::Value> serialize(const std::unique_ptr<{{"::".join(config.imported.namespace)}}::{{domain.domain}}::API::{{type.id}}>& value)
|
| {
|
| - return SerializedValue::create(value->toJSONString());
|
| + return serialize(value.get());
|
| }
|
| };
|
| {% endfor %}
|
|
|
| -} // namespace protocol
|
| -} // namespace blink
|
| +{% for namespace in config.protocol.namespace %}
|
| +} // namespace {{namespace}}
|
| +{% endfor %}
|
|
|
| -#endif // !defined(protocol_{{domain.domain}}_imported_h)
|
| +#endif // !defined({{"_".join(config.protocol.namespace)}}_{{domain.domain}}_imported_h)
|
|
|