| Index: third_party/WebKit/Source/bindings/tests/results/core/ArrayBufferOrArrayBufferViewOrDictionary.cpp
 | 
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/ArrayBufferOrArrayBufferViewOrDictionary.cpp b/third_party/WebKit/Source/bindings/tests/results/core/ArrayBufferOrArrayBufferViewOrDictionary.cpp
 | 
| index 819ca4534322dd7228e186c98df8607a7b632814..23945b908f2fcec4d0b150b3fef1c683fd4c79a2 100644
 | 
| --- a/third_party/WebKit/Source/bindings/tests/results/core/ArrayBufferOrArrayBufferViewOrDictionary.cpp
 | 
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/ArrayBufferOrArrayBufferViewOrDictionary.cpp
 | 
| @@ -15,134 +15,118 @@
 | 
|  
 | 
|  namespace blink {
 | 
|  
 | 
| -ArrayBufferOrArrayBufferViewOrDictionary::ArrayBufferOrArrayBufferViewOrDictionary()
 | 
| -    : m_type(SpecificTypeNone)
 | 
| -{
 | 
| -}
 | 
| +ArrayBufferOrArrayBufferViewOrDictionary::ArrayBufferOrArrayBufferViewOrDictionary() : m_type(SpecificTypeNone) {}
 | 
|  
 | 
| -TestArrayBuffer* ArrayBufferOrArrayBufferViewOrDictionary::getAsArrayBuffer() const
 | 
| -{
 | 
| -    ASSERT(isArrayBuffer());
 | 
| -    return m_arrayBuffer;
 | 
| +TestArrayBuffer* ArrayBufferOrArrayBufferViewOrDictionary::getAsArrayBuffer() const {
 | 
| +  DCHECK(isArrayBuffer());
 | 
| +  return m_arrayBuffer;
 | 
|  }
 | 
|  
 | 
| -void ArrayBufferOrArrayBufferViewOrDictionary::setArrayBuffer(TestArrayBuffer* value)
 | 
| -{
 | 
| -    ASSERT(isNull());
 | 
| -    m_arrayBuffer = value;
 | 
| -    m_type = SpecificTypeArrayBuffer;
 | 
| +void ArrayBufferOrArrayBufferViewOrDictionary::setArrayBuffer(TestArrayBuffer* value) {
 | 
| +  DCHECK(isNull());
 | 
| +  m_arrayBuffer = value;
 | 
| +  m_type = SpecificTypeArrayBuffer;
 | 
|  }
 | 
|  
 | 
| -ArrayBufferOrArrayBufferViewOrDictionary ArrayBufferOrArrayBufferViewOrDictionary::fromArrayBuffer(TestArrayBuffer* value)
 | 
| -{
 | 
| -    ArrayBufferOrArrayBufferViewOrDictionary container;
 | 
| -    container.setArrayBuffer(value);
 | 
| -    return container;
 | 
| +ArrayBufferOrArrayBufferViewOrDictionary ArrayBufferOrArrayBufferViewOrDictionary::fromArrayBuffer(TestArrayBuffer* value) {
 | 
| +  ArrayBufferOrArrayBufferViewOrDictionary container;
 | 
| +  container.setArrayBuffer(value);
 | 
| +  return container;
 | 
|  }
 | 
|  
 | 
| -TestArrayBufferView* ArrayBufferOrArrayBufferViewOrDictionary::getAsArrayBufferView() const
 | 
| -{
 | 
| -    ASSERT(isArrayBufferView());
 | 
| -    return m_arrayBufferView;
 | 
| +TestArrayBufferView* ArrayBufferOrArrayBufferViewOrDictionary::getAsArrayBufferView() const {
 | 
| +  DCHECK(isArrayBufferView());
 | 
| +  return m_arrayBufferView;
 | 
|  }
 | 
|  
 | 
| -void ArrayBufferOrArrayBufferViewOrDictionary::setArrayBufferView(TestArrayBufferView* value)
 | 
| -{
 | 
| -    ASSERT(isNull());
 | 
| -    m_arrayBufferView = value;
 | 
| -    m_type = SpecificTypeArrayBufferView;
 | 
| +void ArrayBufferOrArrayBufferViewOrDictionary::setArrayBufferView(TestArrayBufferView* value) {
 | 
| +  DCHECK(isNull());
 | 
| +  m_arrayBufferView = value;
 | 
| +  m_type = SpecificTypeArrayBufferView;
 | 
|  }
 | 
|  
 | 
| -ArrayBufferOrArrayBufferViewOrDictionary ArrayBufferOrArrayBufferViewOrDictionary::fromArrayBufferView(TestArrayBufferView* value)
 | 
| -{
 | 
| -    ArrayBufferOrArrayBufferViewOrDictionary container;
 | 
| -    container.setArrayBufferView(value);
 | 
| -    return container;
 | 
| +ArrayBufferOrArrayBufferViewOrDictionary ArrayBufferOrArrayBufferViewOrDictionary::fromArrayBufferView(TestArrayBufferView* value) {
 | 
| +  ArrayBufferOrArrayBufferViewOrDictionary container;
 | 
| +  container.setArrayBufferView(value);
 | 
| +  return container;
 | 
|  }
 | 
|  
 | 
| -Dictionary ArrayBufferOrArrayBufferViewOrDictionary::getAsDictionary() const
 | 
| -{
 | 
| -    ASSERT(isDictionary());
 | 
| -    return m_dictionary;
 | 
| +Dictionary ArrayBufferOrArrayBufferViewOrDictionary::getAsDictionary() const {
 | 
| +  DCHECK(isDictionary());
 | 
| +  return m_dictionary;
 | 
|  }
 | 
|  
 | 
| -void ArrayBufferOrArrayBufferViewOrDictionary::setDictionary(Dictionary value)
 | 
| -{
 | 
| -    ASSERT(isNull());
 | 
| -    m_dictionary = value;
 | 
| -    m_type = SpecificTypeDictionary;
 | 
| +void ArrayBufferOrArrayBufferViewOrDictionary::setDictionary(Dictionary value) {
 | 
| +  DCHECK(isNull());
 | 
| +  m_dictionary = value;
 | 
| +  m_type = SpecificTypeDictionary;
 | 
|  }
 | 
|  
 | 
| -ArrayBufferOrArrayBufferViewOrDictionary ArrayBufferOrArrayBufferViewOrDictionary::fromDictionary(Dictionary value)
 | 
| -{
 | 
| -    ArrayBufferOrArrayBufferViewOrDictionary container;
 | 
| -    container.setDictionary(value);
 | 
| -    return container;
 | 
| +ArrayBufferOrArrayBufferViewOrDictionary ArrayBufferOrArrayBufferViewOrDictionary::fromDictionary(Dictionary value) {
 | 
| +  ArrayBufferOrArrayBufferViewOrDictionary container;
 | 
| +  container.setDictionary(value);
 | 
| +  return container;
 | 
|  }
 | 
|  
 | 
|  ArrayBufferOrArrayBufferViewOrDictionary::ArrayBufferOrArrayBufferViewOrDictionary(const ArrayBufferOrArrayBufferViewOrDictionary&) = default;
 | 
|  ArrayBufferOrArrayBufferViewOrDictionary::~ArrayBufferOrArrayBufferViewOrDictionary() = default;
 | 
|  ArrayBufferOrArrayBufferViewOrDictionary& ArrayBufferOrArrayBufferViewOrDictionary::operator=(const ArrayBufferOrArrayBufferViewOrDictionary&) = default;
 | 
|  
 | 
| -DEFINE_TRACE(ArrayBufferOrArrayBufferViewOrDictionary)
 | 
| -{
 | 
| -    visitor->trace(m_arrayBuffer);
 | 
| -    visitor->trace(m_arrayBufferView);
 | 
| +DEFINE_TRACE(ArrayBufferOrArrayBufferViewOrDictionary) {
 | 
| +  visitor->trace(m_arrayBuffer);
 | 
| +  visitor->trace(m_arrayBufferView);
 | 
|  }
 | 
|  
 | 
| -void V8ArrayBufferOrArrayBufferViewOrDictionary::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, ArrayBufferOrArrayBufferViewOrDictionary& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState)
 | 
| -{
 | 
| -    if (v8Value.IsEmpty())
 | 
| -        return;
 | 
| -
 | 
| -    if (conversionMode == UnionTypeConversionMode::Nullable && isUndefinedOrNull(v8Value))
 | 
| -        return;
 | 
| -
 | 
| -    if (v8Value->IsArrayBuffer()) {
 | 
| -        TestArrayBuffer* cppValue = V8ArrayBuffer::toImpl(v8::Local<v8::Object>::Cast(v8Value));
 | 
| -        impl.setArrayBuffer(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| -
 | 
| -    if (v8Value->IsArrayBufferView()) {
 | 
| -        TestArrayBufferView* cppValue = V8ArrayBufferView::toImpl(v8::Local<v8::Object>::Cast(v8Value));
 | 
| -        impl.setArrayBufferView(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| -
 | 
| -    if (isUndefinedOrNull(v8Value) || v8Value->IsObject()) {
 | 
| -        Dictionary cppValue = Dictionary(v8Value, isolate, exceptionState);
 | 
| -        if (exceptionState.hadException())
 | 
| -            return;
 | 
| -        impl.setDictionary(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| -
 | 
| -    exceptionState.throwTypeError("The provided value is not of type '(ArrayBuffer or ArrayBufferView or Dictionary)'");
 | 
| +void V8ArrayBufferOrArrayBufferViewOrDictionary::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, ArrayBufferOrArrayBufferViewOrDictionary& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState) {
 | 
| +  if (v8Value.IsEmpty())
 | 
| +    return;
 | 
| +
 | 
| +  if (conversionMode == UnionTypeConversionMode::Nullable && isUndefinedOrNull(v8Value))
 | 
| +    return;
 | 
| +
 | 
| +  if (v8Value->IsArrayBuffer()) {
 | 
| +    TestArrayBuffer* cppValue = V8ArrayBuffer::toImpl(v8::Local<v8::Object>::Cast(v8Value));
 | 
| +    impl.setArrayBuffer(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  if (v8Value->IsArrayBufferView()) {
 | 
| +    TestArrayBufferView* cppValue = V8ArrayBufferView::toImpl(v8::Local<v8::Object>::Cast(v8Value));
 | 
| +    impl.setArrayBufferView(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  if (isUndefinedOrNull(v8Value) || v8Value->IsObject()) {
 | 
| +    Dictionary cppValue = Dictionary(v8Value, isolate, exceptionState);
 | 
| +    if (exceptionState.hadException())
 | 
| +      return;
 | 
| +    impl.setDictionary(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  exceptionState.throwTypeError("The provided value is not of type '(ArrayBuffer or ArrayBufferView or Dictionary)'");
 | 
|  }
 | 
|  
 | 
| -v8::Local<v8::Value> toV8(const ArrayBufferOrArrayBufferViewOrDictionary& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)
 | 
| -{
 | 
| -    switch (impl.m_type) {
 | 
| +v8::Local<v8::Value> toV8(const ArrayBufferOrArrayBufferViewOrDictionary& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) {
 | 
| +  switch (impl.m_type) {
 | 
|      case ArrayBufferOrArrayBufferViewOrDictionary::SpecificTypeNone:
 | 
| -        return v8::Null(isolate);
 | 
| +      return v8::Null(isolate);
 | 
|      case ArrayBufferOrArrayBufferViewOrDictionary::SpecificTypeArrayBuffer:
 | 
| -        return toV8(impl.getAsArrayBuffer(), creationContext, isolate);
 | 
| +      return toV8(impl.getAsArrayBuffer(), creationContext, isolate);
 | 
|      case ArrayBufferOrArrayBufferViewOrDictionary::SpecificTypeArrayBufferView:
 | 
| -        return toV8(impl.getAsArrayBufferView(), creationContext, isolate);
 | 
| +      return toV8(impl.getAsArrayBufferView(), creationContext, isolate);
 | 
|      case ArrayBufferOrArrayBufferViewOrDictionary::SpecificTypeDictionary:
 | 
| -        return impl.getAsDictionary().v8Value();
 | 
| +      return impl.getAsDictionary().v8Value();
 | 
|      default:
 | 
| -        ASSERT_NOT_REACHED();
 | 
| -    }
 | 
| -    return v8::Local<v8::Value>();
 | 
| +      NOTREACHED();
 | 
| +  }
 | 
| +  return v8::Local<v8::Value>();
 | 
|  }
 | 
|  
 | 
| -ArrayBufferOrArrayBufferViewOrDictionary NativeValueTraits<ArrayBufferOrArrayBufferViewOrDictionary>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState)
 | 
| -{
 | 
| -    ArrayBufferOrArrayBufferViewOrDictionary impl;
 | 
| -    V8ArrayBufferOrArrayBufferViewOrDictionary::toImpl(isolate, value, impl, UnionTypeConversionMode::NotNullable, exceptionState);
 | 
| -    return impl;
 | 
| +ArrayBufferOrArrayBufferViewOrDictionary NativeValueTraits<ArrayBufferOrArrayBufferViewOrDictionary>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState) {
 | 
| +  ArrayBufferOrArrayBufferViewOrDictionary impl;
 | 
| +  V8ArrayBufferOrArrayBufferViewOrDictionary::toImpl(isolate, value, impl, UnionTypeConversionMode::NotNullable, exceptionState);
 | 
| +  return impl;
 | 
|  }
 | 
|  
 | 
| -} // namespace blink
 | 
| +}  // namespace blink
 | 
| 
 |