| Index: third_party/WebKit/Source/bindings/templates/union_container.cpp.tmpl
 | 
| diff --git a/third_party/WebKit/Source/bindings/templates/union_container.cpp.tmpl b/third_party/WebKit/Source/bindings/templates/union_container.cpp.tmpl
 | 
| index 566e4b6cb2b8f3765221b930283b4e2a1cfefbe4..6c9793e1bd74ca6e7af5825a5e774ffc7d297cca 100644
 | 
| --- a/third_party/WebKit/Source/bindings/templates/union_container.cpp.tmpl
 | 
| +++ b/third_party/WebKit/Source/bindings/templates/union_container.cpp.tmpl
 | 
| @@ -1,59 +1,54 @@
 | 
| -{% filter format_blink_cpp_source_code %}
 | 
| -
 | 
|  {% from 'utilities.cpp.tmpl' import declare_enum_validation_variable %}
 | 
| -{% include 'copyright_block.txt' %}
 | 
| -#include "{{this_include_header_name}}.h"
 | 
| -
 | 
|  {% from 'utilities.cpp.tmpl' import v8_value_to_local_cpp_value %}
 | 
| +{#############################################################################}
 | 
|  {% macro assign_and_return_if_hasinstance(member) %}
 | 
|  {% if member.is_array_buffer_or_view_type %}
 | 
|  if (v8Value->Is{{member.type_name}}()) {
 | 
|  {% else %}
 | 
|  if (V8{{member.type_name}}::hasInstance(v8Value, isolate)) {
 | 
|  {% endif %}
 | 
| -    {{member.cpp_local_type}} cppValue = V8{{member.type_name}}::toImpl(v8::Local<v8::Object>::Cast(v8Value));
 | 
| -    impl.set{{member.type_name}}(cppValue);
 | 
| -    return;
 | 
| +  {{member.cpp_local_type}} cppValue = V8{{member.type_name}}::toImpl(v8::Local<v8::Object>::Cast(v8Value));
 | 
| +  impl.set{{member.type_name}}(cppValue);
 | 
| +  return;
 | 
|  }
 | 
|  {% endmacro %}
 | 
| +{#############################################################################}
 | 
| +{% filter format_blink_cpp_source_code %}
 | 
| +{% include 'copyright_block.txt' %}
 | 
| +#include "{{this_include_header_name}}.h"
 | 
| +
 | 
|  {% for filename in cpp_includes %}
 | 
|  #include "{{filename}}"
 | 
|  {% endfor %}
 | 
|  
 | 
|  namespace blink {
 | 
|  
 | 
| -{{cpp_class}}::{{cpp_class}}()
 | 
| -    : m_type(SpecificTypeNone)
 | 
| -{
 | 
| -}
 | 
| +{{cpp_class}}::{{cpp_class}}() : m_type(SpecificTypeNone) {}
 | 
|  
 | 
|  {% for member in members %}
 | 
| -{{member.rvalue_cpp_type}} {{cpp_class}}::getAs{{member.type_name}}() const
 | 
| -{
 | 
| -    ASSERT(is{{member.type_name}}());
 | 
| -    return m_{{member.cpp_name}};
 | 
| +{{member.rvalue_cpp_type}} {{cpp_class}}::getAs{{member.type_name}}() const {
 | 
| +  DCHECK(is{{member.type_name}}());
 | 
| +  return m_{{member.cpp_name}};
 | 
|  }
 | 
|  
 | 
| -void {{cpp_class}}::set{{member.type_name}}({{member.rvalue_cpp_type}} value)
 | 
| -{
 | 
| -    ASSERT(isNull());
 | 
| -    {% if member.enum_values %}
 | 
| -    NonThrowableExceptionState exceptionState;
 | 
| -    {{declare_enum_validation_variable(member.enum_values) | indent}}
 | 
| -    if (!isValidEnum(value, validValues, WTF_ARRAY_LENGTH(validValues), "{{member.type_name}}", exceptionState)) {
 | 
| -        ASSERT_NOT_REACHED();
 | 
| -        return;
 | 
| -    }
 | 
| -    {% endif %}
 | 
| -    m_{{member.cpp_name}} = value;
 | 
| -    m_type = {{member.specific_type_enum}};
 | 
| +void {{cpp_class}}::set{{member.type_name}}({{member.rvalue_cpp_type}} value) {
 | 
| +  DCHECK(isNull());
 | 
| +  {% if member.enum_values %}
 | 
| +  NonThrowableExceptionState exceptionState;
 | 
| +  {{declare_enum_validation_variable(member.enum_values) | indent(2)}}
 | 
| +  if (!isValidEnum(value, validValues, WTF_ARRAY_LENGTH(validValues), "{{member.type_name}}", exceptionState)) {
 | 
| +    NOTREACHED();
 | 
| +    return;
 | 
| +  }
 | 
| +  {% endif %}
 | 
| +  m_{{member.cpp_name}} = value;
 | 
| +  m_type = {{member.specific_type_enum}};
 | 
|  }
 | 
|  
 | 
| -{{cpp_class}} {{cpp_class}}::from{{member.type_name}}({{member.rvalue_cpp_type}} value)
 | 
| -{
 | 
| -    {{cpp_class}} container;
 | 
| -    container.set{{member.type_name}}(value);
 | 
| -    return container;
 | 
| +{{cpp_class}} {{cpp_class}}::from{{member.type_name}}({{member.rvalue_cpp_type}} value) {
 | 
| +  {{cpp_class}} container;
 | 
| +  container.set{{member.type_name}}(value);
 | 
| +  return container;
 | 
|  }
 | 
|  
 | 
|  {% endfor %}
 | 
| @@ -61,156 +56,152 @@ void {{cpp_class}}::set{{member.type_name}}({{member.rvalue_cpp_type}} value)
 | 
|  {{cpp_class}}::~{{cpp_class}}() = default;
 | 
|  {{cpp_class}}& {{cpp_class}}::operator=(const {{cpp_class}}&) = default;
 | 
|  
 | 
| -DEFINE_TRACE({{cpp_class}})
 | 
| -{
 | 
| -    {% for member in members if member.is_traceable %}
 | 
| -    visitor->trace(m_{{member.cpp_name}});
 | 
| -    {% endfor %}
 | 
| +DEFINE_TRACE({{cpp_class}}) {
 | 
| +  {% for member in members if member.is_traceable %}
 | 
| +  visitor->trace(m_{{member.cpp_name}});
 | 
| +  {% endfor %}
 | 
|  }
 | 
|  
 | 
| -void {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, {{cpp_class}}& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState)
 | 
| -{
 | 
| -    if (v8Value.IsEmpty())
 | 
| -        return;
 | 
| -
 | 
| -    {# The numbers in the following comments refer to the steps described in
 | 
| -       http://heycam.github.io/webidl/#es-union #}
 | 
| -    {# 1. null or undefined #}
 | 
| -    if (conversionMode == UnionTypeConversionMode::Nullable && isUndefinedOrNull(v8Value))
 | 
| -        return;
 | 
| -
 | 
| -    {% if dictionary_type %}
 | 
| -    {# 3. Dictionaries for null or undefined #}
 | 
| -    if (isUndefinedOrNull(v8Value)) {
 | 
| -        {{v8_value_to_local_cpp_value(dictionary_type) | indent(8)}}
 | 
| -        impl.set{{dictionary_type.type_name}}(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| -
 | 
| -    {% endif %}
 | 
| -    {# 4. Platform objects (interfaces) #}
 | 
| -    {% for interface in interface_types %}
 | 
| -    {{assign_and_return_if_hasinstance(interface) | indent}}
 | 
| -
 | 
| -    {% endfor %}
 | 
| -    {# 8. ArrayBuffer #}
 | 
| -    {% if array_buffer_type %}
 | 
| -    {{assign_and_return_if_hasinstance(array_buffer_type) | indent}}
 | 
| -
 | 
| -    {% endif %}
 | 
| -    {# 9., 10. ArrayBufferView #}
 | 
| -    {# FIXME: Individual typed arrays (e.g. Uint8Array) aren\'t supported yet. #}
 | 
| -    {% if array_buffer_view_type %}
 | 
| -    {{assign_and_return_if_hasinstance(array_buffer_view_type) | indent}}
 | 
| -
 | 
| -    {% endif %}
 | 
| -    {% if array_or_sequence_type %}
 | 
| -    {# 12.1, 12.2. Arrays and Sequences #}
 | 
| -    {# FIXME: This should also check "object but not RegExp". Add checks
 | 
| -       when we implement conversions for Date and RegExp. #}
 | 
| -    {# TODO(bashi): Should check @@iterator symbol instead. #}
 | 
| -    if (v8Value->IsArray()) {
 | 
| -        {{v8_value_to_local_cpp_value(array_or_sequence_type) | indent(8)}}
 | 
| -        impl.set{{array_or_sequence_type.type_name}}(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| +void {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, {{cpp_class}}& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState) {
 | 
| +  if (v8Value.IsEmpty())
 | 
| +    return;
 | 
|  
 | 
| -    {% endif %}
 | 
| -    {% if dictionary_type %}
 | 
| -    {# 12.3. Dictionaries #}
 | 
| -    if (v8Value->IsObject()) {
 | 
| -        {{v8_value_to_local_cpp_value(dictionary_type) | indent(8)}}
 | 
| -        impl.set{{dictionary_type.type_name}}(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| +  {# The numbers in the following comments refer to the steps described in
 | 
| +     http://heycam.github.io/webidl/#es-union #}
 | 
| +  {# 1. null or undefined #}
 | 
| +  if (conversionMode == UnionTypeConversionMode::Nullable && isUndefinedOrNull(v8Value))
 | 
| +    return;
 | 
|  
 | 
| +  {% if dictionary_type %}
 | 
| +  {# 3. Dictionaries for null or undefined #}
 | 
| +  if (isUndefinedOrNull(v8Value)) {
 | 
| +    {{v8_value_to_local_cpp_value(dictionary_type) | indent}}
 | 
| +    impl.set{{dictionary_type.type_name}}(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  {% endif %}
 | 
| +  {# 4. Platform objects (interfaces) #}
 | 
| +  {% for interface in interface_types %}
 | 
| +  {{assign_and_return_if_hasinstance(interface) | indent(2)}}
 | 
| +
 | 
| +  {% endfor %}
 | 
| +  {# 8. ArrayBuffer #}
 | 
| +  {% if array_buffer_type %}
 | 
| +  {{assign_and_return_if_hasinstance(array_buffer_type) | indent(2)}}
 | 
| +
 | 
| +  {% endif %}
 | 
| +  {# 9., 10. ArrayBufferView #}
 | 
| +  {# FIXME: Individual typed arrays (e.g. Uint8Array) aren\'t supported yet. #}
 | 
| +  {% if array_buffer_view_type %}
 | 
| +  {{assign_and_return_if_hasinstance(array_buffer_view_type) | indent(2)}}
 | 
| +
 | 
| +  {% endif %}
 | 
| +  {% if array_or_sequence_type %}
 | 
| +  {# 12.1, 12.2. Arrays and Sequences #}
 | 
| +  {# FIXME: This should also check "object but not RegExp". Add checks
 | 
| +     when we implement conversions for Date and RegExp. #}
 | 
| +  {# TODO(bashi): Should check @@iterator symbol instead. #}
 | 
| +  if (v8Value->IsArray()) {
 | 
| +    {{v8_value_to_local_cpp_value(array_or_sequence_type) | indent}}
 | 
| +    impl.set{{array_or_sequence_type.type_name}}(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  {% endif %}
 | 
| +  {% if dictionary_type %}
 | 
| +  {# 12.3. Dictionaries #}
 | 
| +  if (v8Value->IsObject()) {
 | 
| +    {{v8_value_to_local_cpp_value(dictionary_type) | indent}}
 | 
| +    impl.set{{dictionary_type.type_name}}(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  {% endif %}
 | 
| +  {# TODO(bashi): Support 12.4 Callback interface when we need it #}
 | 
| +  {# 12.5. Objects #}
 | 
| +  {% if object_type %}
 | 
| +  if (isUndefinedOrNull(v8Value) || v8Value->IsObject()) {
 | 
| +    {{v8_value_to_local_cpp_value(object_type) | indent}}
 | 
| +    impl.set{{object_type.type_name}}(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  {% endif %}
 | 
| +  {# FIXME: In some cases, we can omit boolean and numeric type checks because
 | 
| +     we have fallback conversions. (step 16 and 17) #}
 | 
| +  {% if boolean_type %}
 | 
| +  {# 13. Boolean #}
 | 
| +  if (v8Value->IsBoolean()) {
 | 
| +    impl.setBoolean(v8Value.As<v8::Boolean>()->Value());
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  {% endif %}
 | 
| +  {% if numeric_type %}
 | 
| +  {# 14. Number #}
 | 
| +  if (v8Value->IsNumber()) {
 | 
| +    {{v8_value_to_local_cpp_value(numeric_type) | indent}}
 | 
| +    impl.set{{numeric_type.type_name}}(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  {% endif %}
 | 
| +  {% if string_type %}
 | 
| +  {# 15. String #}
 | 
| +  {
 | 
| +    {{v8_value_to_local_cpp_value(string_type) | indent}}
 | 
| +    {% if string_type.enum_values %}
 | 
| +    {{declare_enum_validation_variable(string_type.enum_values) | indent}}
 | 
| +    if (!isValidEnum(cppValue, validValues, WTF_ARRAY_LENGTH(validValues), "{{string_type.type_name}}", exceptionState))
 | 
| +      return;
 | 
|      {% endif %}
 | 
| -    {# TODO(bashi): Support 12.4 Callback interface when we need it #}
 | 
| -    {# 12.5. Objects #}
 | 
| -    {% if object_type %}
 | 
| -    if (isUndefinedOrNull(v8Value) || v8Value->IsObject()) {
 | 
| -        {{v8_value_to_local_cpp_value(object_type) | indent(8)}}
 | 
| -        impl.set{{object_type.type_name}}(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| +    impl.set{{string_type.type_name}}(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
|  
 | 
| -    {% endif %}
 | 
| -    {# FIXME: In some cases, we can omit boolean and numeric type checks because
 | 
| -       we have fallback conversions. (step 16 and 17) #}
 | 
| -    {% if boolean_type %}
 | 
| -    {# 13. Boolean #}
 | 
| -    if (v8Value->IsBoolean()) {
 | 
| -        impl.setBoolean(v8Value.As<v8::Boolean>()->Value());
 | 
| -        return;
 | 
| -    }
 | 
| +  {# 16. Number (fallback) #}
 | 
| +  {% elif numeric_type %}
 | 
| +  {
 | 
| +    {{v8_value_to_local_cpp_value(numeric_type) | indent}}
 | 
| +    impl.set{{numeric_type.type_name}}(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
|  
 | 
| -    {% endif %}
 | 
| -    {% if numeric_type %}
 | 
| -    {# 14. Number #}
 | 
| -    if (v8Value->IsNumber()) {
 | 
| -        {{v8_value_to_local_cpp_value(numeric_type) | indent(8)}}
 | 
| -        impl.set{{numeric_type.type_name}}(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| +  {# 17. Boolean (fallback) #}
 | 
| +  {% elif boolean_type %}
 | 
| +  {
 | 
| +    impl.setBoolean(v8Value->BooleanValue());
 | 
| +    return;
 | 
| +  }
 | 
|  
 | 
| -    {% endif %}
 | 
| -    {% if string_type %}
 | 
| -    {# 15. String #}
 | 
| -    {
 | 
| -        {{v8_value_to_local_cpp_value(string_type) | indent(8)}}
 | 
| -        {% if string_type.enum_values %}
 | 
| -        {{declare_enum_validation_variable(string_type.enum_values) | indent(8)}}
 | 
| -        if (!isValidEnum(cppValue, validValues, WTF_ARRAY_LENGTH(validValues), "{{string_type.type_name}}", exceptionState))
 | 
| -            return;
 | 
| -        {% endif %}
 | 
| -        impl.set{{string_type.type_name}}(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| -
 | 
| -    {# 16. Number (fallback) #}
 | 
| -    {% elif numeric_type %}
 | 
| -    {
 | 
| -        {{v8_value_to_local_cpp_value(numeric_type) | indent(8)}}
 | 
| -        impl.set{{numeric_type.type_name}}(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| -
 | 
| -    {# 17. Boolean (fallback) #}
 | 
| -    {% elif boolean_type %}
 | 
| -    {
 | 
| -        impl.setBoolean(v8Value->BooleanValue());
 | 
| -        return;
 | 
| -    }
 | 
| -
 | 
| -    {% else %}
 | 
| -    {# 18. TypeError #}
 | 
| -    exceptionState.throwTypeError("The provided value is not of type '{{type_string}}'");
 | 
| -    {% endif %}
 | 
| +  {% else %}
 | 
| +  {# 18. TypeError #}
 | 
| +  exceptionState.throwTypeError("The provided value is not of type '{{type_string}}'");
 | 
| +  {% endif %}
 | 
|  }
 | 
|  
 | 
| -v8::Local<v8::Value> toV8(const {{cpp_class}}& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)
 | 
| -{
 | 
| -    switch (impl.m_type) {
 | 
| +v8::Local<v8::Value> toV8(const {{cpp_class}}& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) {
 | 
| +  switch (impl.m_type) {
 | 
|      case {{cpp_class}}::SpecificTypeNone:
 | 
| -        {# FIXME: We might want to return undefined in some cases #}
 | 
| -        return v8::Null(isolate);
 | 
| +      {# FIXME: We might want to return undefined in some cases #}
 | 
| +      return v8::Null(isolate);
 | 
|      {% for member in members %}
 | 
|      case {{cpp_class}}::{{member.specific_type_enum}}:
 | 
| -        return {{member.cpp_value_to_v8_value}};
 | 
| +      return {{member.cpp_value_to_v8_value}};
 | 
|      {% endfor %}
 | 
|      default:
 | 
| -        ASSERT_NOT_REACHED();
 | 
| -    }
 | 
| -    return v8::Local<v8::Value>();
 | 
| +      NOTREACHED();
 | 
| +  }
 | 
| +  return v8::Local<v8::Value>();
 | 
|  }
 | 
|  
 | 
| -{{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, UnionTypeConversionMode::NotNullable, 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, UnionTypeConversionMode::NotNullable, exceptionState);
 | 
| +  return impl;
 | 
|  }
 | 
|  
 | 
| -} // namespace blink
 | 
| +}  // namespace blink
 | 
|  
 | 
|  {% endfilter %}{# format_blink_cpp_source_code #}
 | 
| 
 |