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

Unified Diff: third_party/WebKit/Source/bindings/templates/dictionary_v8.cpp.tmpl

Issue 2452403002: [Bindings] Reformat template files (4/4) (Closed)
Patch Set: Rebase Created 4 years, 2 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/bindings/templates/dictionary_v8.cpp.tmpl
diff --git a/third_party/WebKit/Source/bindings/templates/dictionary_v8.cpp.tmpl b/third_party/WebKit/Source/bindings/templates/dictionary_v8.cpp.tmpl
index 4b5465ee482347050e112f29bf696f82bacd85d5..9686ba65546a4003ae0c0f9f66c71a162c1a32e8 100644
--- a/third_party/WebKit/Source/bindings/templates/dictionary_v8.cpp.tmpl
+++ b/third_party/WebKit/Source/bindings/templates/dictionary_v8.cpp.tmpl
@@ -11,132 +11,128 @@
namespace blink {
{% from 'utilities.cpp.tmpl' import v8_value_to_local_cpp_value %}
-void {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, {{cpp_class}}& impl, ExceptionState& exceptionState)
-{
- if (isUndefinedOrNull(v8Value)) {
- {% if required_member_names %}
- exceptionState.throwTypeError("Missing required member(s): {{required_member_names|join(', ')}}.");
- {% endif %}
- return;
- }
- if (!v8Value->IsObject()) {
- {% if use_permissive_dictionary_conversion %}
- // Do nothing.
- return;
- {% else %}
- exceptionState.throwTypeError("cannot convert to dictionary.");
- return;
- {% endif %}
- }
+void {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, {{cpp_class}}& impl, ExceptionState& exceptionState) {
+ if (isUndefinedOrNull(v8Value)) {
+ {% if required_member_names %}
+ exceptionState.throwTypeError("Missing required member(s): {{required_member_names|join(', ')}}.");
+ {% endif %}
+ return;
+ }
+ if (!v8Value->IsObject()) {
+ {% if use_permissive_dictionary_conversion %}
+ // Do nothing.
+ return;
+ {% else %}
+ exceptionState.throwTypeError("cannot convert to dictionary.");
+ return;
+ {% endif %}
+ }
- {% if parent_v8_class %}
- {{parent_v8_class}}::toImpl(isolate, v8Value, impl, exceptionState);
- if (exceptionState.hadException())
- return;
+ {% if parent_v8_class %}
+ {{parent_v8_class}}::toImpl(isolate, v8Value, impl, exceptionState);
+ if (exceptionState.hadException())
+ return;
+ {% endif %}
+ {# Declare local variables only when the dictionary has members to avoid unused variable warnings. #}
+ {% if members %}
+ v8::TryCatch block(isolate);
+ v8::Local<v8::Object> v8Object;
+ if (!v8Call(v8Value->ToObject(isolate->GetCurrentContext()), v8Object, block)) {
+ exceptionState.rethrowV8Exception(block.Exception());
+ return;
+ }
+ {% endif %}
+ {% for member in members %}
+ {% filter runtime_enabled(member.runtime_enabled_function) %}
+ v8::Local<v8::Value> {{member.name}}Value;
+ if (!v8Object->Get(isolate->GetCurrentContext(), v8String(isolate, "{{member.name}}")).ToLocal(&{{member.name}}Value)) {
+ exceptionState.rethrowV8Exception(block.Exception());
+ return;
+ }
+ if ({{member.name}}Value.IsEmpty() || {{member.name}}Value->IsUndefined()) {
+ {% if member.is_required %}
+ exceptionState.throwTypeError("required member {{member.name}} is undefined.");
+ return;
+ {% else %}
+ // Do nothing.
{% endif %}
- {# Declare local variables only when the dictionary has members to avoid unused variable warnings. #}
- {% if members %}
- v8::TryCatch block(isolate);
- v8::Local<v8::Object> v8Object;
- if (!v8Call(v8Value->ToObject(isolate->GetCurrentContext()), v8Object, block)) {
- exceptionState.rethrowV8Exception(block.Exception());
- return;
- }
+ {% if member.is_nullable %}
+ } else if ({{member.name}}Value->IsNull()) {
+ impl.{{member.null_setter_name}}();
+ {% endif %}
+ } else {
+ {% if member.deprecate_as %}
+ Deprecation::countDeprecationIfNotPrivateScript(isolate, currentExecutionContext(isolate), UseCounter::{{member.deprecate_as}});
{% endif %}
- {% for member in members %}
- {% filter runtime_enabled(member.runtime_enabled_function) %}
- v8::Local<v8::Value> {{member.name}}Value;
- if (!v8Object->Get(isolate->GetCurrentContext(), v8String(isolate, "{{member.name}}")).ToLocal(&{{member.name}}Value)) {
- exceptionState.rethrowV8Exception(block.Exception());
- return;
+ {{v8_value_to_local_cpp_value(member) | indent}}
+ {% if member.is_interface_type %}
+ if (!{{member.name}}) {
+ exceptionState.throwTypeError("member {{member.name}} is not of type {{member.idl_type}}.");
+ return;
}
- if ({{member.name}}Value.IsEmpty() || {{member.name}}Value->IsUndefined()) {
- {% if member.is_required %}
- exceptionState.throwTypeError("required member {{member.name}} is undefined.");
- return;
- {% else %}
- // Do nothing.
- {% endif %}
- {% if member.is_nullable %}
- } else if ({{member.name}}Value->IsNull()) {
- impl.{{member.null_setter_name}}();
{% endif %}
- } else {
- {% if member.deprecate_as %}
- Deprecation::countDeprecationIfNotPrivateScript(isolate, currentExecutionContext(isolate), UseCounter::{{member.deprecate_as}});
- {% endif %}
- {{v8_value_to_local_cpp_value(member) | indent(8)}}
- {% if member.is_interface_type %}
- if (!{{member.name}}) {
- exceptionState.throwTypeError("member {{member.name}} is not of type {{member.idl_type}}.");
- return;
- }
- {% endif %}
- {% if member.enum_values %}
- {{declare_enum_validation_variable(member.enum_values) | indent(8)}}
- if (!isValidEnum({{member.name}}, validValues, WTF_ARRAY_LENGTH(validValues), "{{member.enum_type}}", exceptionState))
- return;
- {% elif member.is_object %}
- if (!{{member.name}}.isObject()) {
- exceptionState.throwTypeError("member {{member.name}} is not an object.");
- return;
- }
- {% endif %}
- impl.{{member.setter_name}}({{member.name}});
+ {% if member.enum_values %}
+ {{declare_enum_validation_variable(member.enum_values) | indent}}
+ if (!isValidEnum({{member.name}}, validValues, WTF_ARRAY_LENGTH(validValues), "{{member.enum_type}}", exceptionState))
+ return;
+ {% elif member.is_object %}
+ if (!{{member.name}}.isObject()) {
+ exceptionState.throwTypeError("member {{member.name}} is not an object.");
+ return;
}
- {% endfilter %}
+ {% endif %}
+ impl.{{member.setter_name}}({{member.name}});
+ }
+ {% endfilter %}
- {% endfor %}
+ {% endfor %}
}
-v8::Local<v8::Value> {{cpp_class}}::toV8Impl(v8::Local<v8::Object> creationContext, v8::Isolate* isolate) const
-{
- v8::Local<v8::Object> v8Object = v8::Object::New(isolate);
- if (!toV8{{cpp_class}}(*this, v8Object, creationContext, isolate))
- return v8::Undefined(isolate);
- return v8Object;
+v8::Local<v8::Value> {{cpp_class}}::toV8Impl(v8::Local<v8::Object> creationContext, v8::Isolate* isolate) const {
+ v8::Local<v8::Object> v8Object = v8::Object::New(isolate);
+ if (!toV8{{cpp_class}}(*this, v8Object, creationContext, isolate))
+ return v8::Undefined(isolate);
+ return v8Object;
}
-bool toV8{{cpp_class}}(const {{cpp_class}}& impl, v8::Local<v8::Object> dictionary, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)
-{
- {% if parent_v8_class %}
- if (!toV8{{parent_cpp_class}}(impl, dictionary, creationContext, isolate))
- return false;
+bool toV8{{cpp_class}}(const {{cpp_class}}& impl, v8::Local<v8::Object> dictionary, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) {
+ {% if parent_v8_class %}
+ if (!toV8{{parent_cpp_class}}(impl, dictionary, creationContext, isolate))
+ return false;
+ {% endif %}
+ {% for member in members %}
+ if (impl.{{member.has_method_name}}()) {
+ {% if member.is_object %}
+ DCHECK(impl.{{member.cpp_name}}().isObject());
{% endif %}
- {% for member in members %}
- if (impl.{{member.has_method_name}}()) {
- {% if member.is_object %}
- ASSERT(impl.{{member.cpp_name}}().isObject());
- {% endif %}
- if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "{{member.name}}"), {{member.cpp_value_to_v8_value}})))
- return false;
- {% if member.v8_default_value %}
- } else {
- if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "{{member.name}}"), {{member.v8_default_value}})))
- return false;
- {% elif member.is_nullable %}
- } else {
- if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "{{member.name}}"), v8::Null(isolate))))
- return false;
- {% elif member.is_required %}
- } else {
- ASSERT_NOT_REACHED();
- {% endif %}
- }
+ if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "{{member.name}}"), {{member.cpp_value_to_v8_value}})))
+ return false;
+ {% if member.v8_default_value %}
+ } else {
+ if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "{{member.name}}"), {{member.v8_default_value}})))
+ return false;
+ {% elif member.is_nullable %}
+ } else {
+ if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "{{member.name}}"), v8::Null(isolate))))
+ return false;
+ {% elif member.is_required %}
+ } else {
+ NOTREACHED();
+ {% endif %}
+ }
- {% endfor %}
- return true;
+ {% endfor %}
+ return true;
}
-{{cpp_class}} NativeValueTraits<{{cpp_class}}>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState)
-{
- {{cpp_class}} impl;
- {{v8_class}}::toImpl(isolate, value, impl, exceptionState);
- return impl;
+{{cpp_class}} NativeValueTraits<{{cpp_class}}>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState) {
+ {{cpp_class}} impl;
+ {{v8_class}}::toImpl(isolate, value, impl, exceptionState);
+ return impl;
}
-} // namespace blink
+} // namespace blink
{% endfilter %}{# format_blink_cpp_source_code #}

Powered by Google App Engine
This is Rietveld 408576698