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

Source/bindings/templates/dictionary_v8.cpp

 // Copyright 2014 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.
 
 // This file has been auto-generated by {{code_generator}}. DO NOT MODIFY!
 
 #include "config.h"
 #include "{{v8_original_class}}.h"
 
 {% for filename in cpp_includes if filename != '%s.h' % v8_class %}
 #include "{{filename}}"
 {% endfor %}
 
 namespace blink {
 
-{% macro convert_and_set_member(member) %}
-{% endmacro %}
 void {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Handle<v8::Value> v8Value, {{cpp_class}}& impl, ExceptionState& exceptionState)
 {
     if (isUndefinedOrNull(v8Value))
         return;
     if (!v8Value->IsObject()) {
         exceptionState.throwTypeError("cannot convert to dictionary.");
         return;
     }
 
     {% if parent_v8_class %}
     {{parent_v8_class}}::toImpl(isolate, v8Value, impl, exceptionState);
     if (exceptionState.hadException())
         return;
 
     {% endif %}
     v8::Local<v8::Object> v8Object = v8Value->ToObject(isolate);
     v8::TryCatch block;
     {% for member in members %}
     v8::Local<v8::Value> {{member.name}}Value = v8Object->Get(v8String(isolate, "{{member.name}}"));
-    if (block.HasCaught()) {
-        exceptionState.rethrowV8Exception(block.Exception());
-        return;
-    }
-    if ({{member.name}}Value.IsEmpty() || {{member.name}}Value->IsUndefined()) {
-        // Do nothing.
-    {% if member.is_nullable %}
-    } else if ({{member.name}}Value->IsNull()) {
-        impl.{{member.null_setter_name}}();
+    if (!{{member.name}}Value.IsEmpty() && !isUndefinedOrNull({{member.name}}Value)) {
+    {% if member.use_output_parameter_for_result %}
+        {{member.cpp_type}} {{member.name}};
     {% endif %}
-    } else {
-        {% 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 %}
+    {% 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 %}
+    {% elif member.is_object %}
         if (!{{member.name}}.isObject()) {
             exceptionState.throwTypeError("member {{member.name}} is not an object.");
             return;
         }
-        {% endif %}
+    {% endif %}
         impl.{{member.setter_name}}({{member.name}});
+    } else if (block.HasCaught()) {
+        exceptionState.rethrowV8Exception(block.Exception());
+        return;
     }
 
     {% endfor %}
 }
 
 v8::Handle<v8::Value> toV8(const {{cpp_class}}& impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     v8::Handle<v8::Object> v8Object = v8::Object::New(isolate);
     {% if parent_v8_class %}
     toV8{{parent_cpp_class}}(impl, v8Object, creationContext, isolate);
@@ skipping 26 matching lines @@
 }
 
 {{cpp_class}} NativeValueTraits<{{cpp_class}}>::nativeValue(const v8::Handle<v8::Value>& value, v8::Isolate* isolate, ExceptionState& exceptionState)
 {
     {{cpp_class}} impl;
     {{v8_class}}::toImpl(isolate, value, impl, exceptionState);
     return impl;
 }
 
 } // namespace blink