IDL: Null values should be converted for non-nullable dictionary members

Source/bindings/templates/dictionary_v8.cpp

Index: Source/bindings/templates/dictionary_v8.cpp
diff --git a/Source/bindings/templates/dictionary_v8.cpp b/Source/bindings/templates/dictionary_v8.cpp
index 94a48cdf5a905696c430ecc76932f09beb4d8a7a..03a180f951a47148bcc8b5a0a5c560dd8bc7424e 100644
--- a/Source/bindings/templates/dictionary_v8.cpp
+++ b/Source/bindings/templates/dictionary_v8.cpp
@@ -13,6 +13,25 @@
 
 namespace blink {
 
+{% macro convert_and_set_member(member) %}
+{% if member.use_output_parameter_for_result %}
+{{member.cpp_type}} {{member.name}};
+{% endif %}
+{{member.v8_value_to_local_cpp_value}};
+{% if member.enum_validation_expression %}
+String string = {{member.name}};
+if (!({{member.enum_validation_expression}})) {
+    exceptionState.throwTypeError("member {{member.name}} ('" + string + "') is not a valid enum value.");
+    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}});
+{% endmacro %}
 void {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Handle<v8::Value> v8Value, {{cpp_class}}& impl, ExceptionState& exceptionState)
 {
     if (isUndefinedOrNull(v8Value))
@@ -32,24 +51,16 @@ void {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Handle<v8::Value> v8Value, {
     v8::TryCatch block;
     {% for member in members %}
     v8::Local<v8::Value> {{member.name}}Value = v8Object->Get(v8String(isolate, "{{member.name}}"));
-    if (!{{member.name}}Value.IsEmpty() && !isUndefinedOrNull({{member.name}}Value)) {
-    {% if member.use_output_parameter_for_result %}
-        {{member.cpp_type}} {{member.name}};
-    {% endif %}
-        {{member.v8_value_to_local_cpp_value}};
-    {% if member.enum_validation_expression %}
-        String string = {{member.name}};
-        if (!({{member.enum_validation_expression}})) {
-            exceptionState.throwTypeError("member {{member.name}} ('" + string + "') is not a valid enum value.");
-            return;
+    if (!{{member.name}}Value.IsEmpty() && !{{member.name}}Value->IsUndefined()) {
+        {% if member.is_nullable %}
+        if ({{member.name}}Value->IsNull()) {
+            impl.{{member.resetter_name}}();

[bashi, 2014/11/28 05:14:16]

This is need to reset default values. Default values are set in impl's
constructor, but setting null for nullable member is valid and it should be
null, rather than the default value.

+        } else {
+            {{convert_and_set_member(member) | indent(12)}}
         }
-    {% 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}});
+        {% else %}
+        {{convert_and_set_member(member) | indent(8)}}
+        {% endif %}
     } else if (block.HasCaught()) {
         exceptionState.rethrowV8Exception(block.Exception());
         return;