| Index: third_party/WebKit/Source/bindings/tests/results/core/StringOrDouble.cpp
 | 
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/StringOrDouble.cpp b/third_party/WebKit/Source/bindings/tests/results/core/StringOrDouble.cpp
 | 
| index 339d9c886ee48f78930c538874a140537525bc52..8a51325a97ab5efe5f686b2d3835d59e205650d9 100644
 | 
| --- a/third_party/WebKit/Source/bindings/tests/results/core/StringOrDouble.cpp
 | 
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/StringOrDouble.cpp
 | 
| @@ -11,104 +11,91 @@
 | 
|  
 | 
|  namespace blink {
 | 
|  
 | 
| -StringOrDouble::StringOrDouble()
 | 
| -    : m_type(SpecificTypeNone)
 | 
| -{
 | 
| -}
 | 
| +StringOrDouble::StringOrDouble() : m_type(SpecificTypeNone) {}
 | 
|  
 | 
| -String StringOrDouble::getAsString() const
 | 
| -{
 | 
| -    ASSERT(isString());
 | 
| -    return m_string;
 | 
| +String StringOrDouble::getAsString() const {
 | 
| +  DCHECK(isString());
 | 
| +  return m_string;
 | 
|  }
 | 
|  
 | 
| -void StringOrDouble::setString(String value)
 | 
| -{
 | 
| -    ASSERT(isNull());
 | 
| -    m_string = value;
 | 
| -    m_type = SpecificTypeString;
 | 
| +void StringOrDouble::setString(String value) {
 | 
| +  DCHECK(isNull());
 | 
| +  m_string = value;
 | 
| +  m_type = SpecificTypeString;
 | 
|  }
 | 
|  
 | 
| -StringOrDouble StringOrDouble::fromString(String value)
 | 
| -{
 | 
| -    StringOrDouble container;
 | 
| -    container.setString(value);
 | 
| -    return container;
 | 
| +StringOrDouble StringOrDouble::fromString(String value) {
 | 
| +  StringOrDouble container;
 | 
| +  container.setString(value);
 | 
| +  return container;
 | 
|  }
 | 
|  
 | 
| -double StringOrDouble::getAsDouble() const
 | 
| -{
 | 
| -    ASSERT(isDouble());
 | 
| -    return m_double;
 | 
| +double StringOrDouble::getAsDouble() const {
 | 
| +  DCHECK(isDouble());
 | 
| +  return m_double;
 | 
|  }
 | 
|  
 | 
| -void StringOrDouble::setDouble(double value)
 | 
| -{
 | 
| -    ASSERT(isNull());
 | 
| -    m_double = value;
 | 
| -    m_type = SpecificTypeDouble;
 | 
| +void StringOrDouble::setDouble(double value) {
 | 
| +  DCHECK(isNull());
 | 
| +  m_double = value;
 | 
| +  m_type = SpecificTypeDouble;
 | 
|  }
 | 
|  
 | 
| -StringOrDouble StringOrDouble::fromDouble(double value)
 | 
| -{
 | 
| -    StringOrDouble container;
 | 
| -    container.setDouble(value);
 | 
| -    return container;
 | 
| +StringOrDouble StringOrDouble::fromDouble(double value) {
 | 
| +  StringOrDouble container;
 | 
| +  container.setDouble(value);
 | 
| +  return container;
 | 
|  }
 | 
|  
 | 
|  StringOrDouble::StringOrDouble(const StringOrDouble&) = default;
 | 
|  StringOrDouble::~StringOrDouble() = default;
 | 
|  StringOrDouble& StringOrDouble::operator=(const StringOrDouble&) = default;
 | 
|  
 | 
| -DEFINE_TRACE(StringOrDouble)
 | 
| -{
 | 
| +DEFINE_TRACE(StringOrDouble) {
 | 
|  }
 | 
|  
 | 
| -void V8StringOrDouble::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, StringOrDouble& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState)
 | 
| -{
 | 
| -    if (v8Value.IsEmpty())
 | 
| -        return;
 | 
| -
 | 
| -    if (conversionMode == UnionTypeConversionMode::Nullable && isUndefinedOrNull(v8Value))
 | 
| -        return;
 | 
| -
 | 
| -    if (v8Value->IsNumber()) {
 | 
| -        double cppValue = toRestrictedDouble(isolate, v8Value, exceptionState);
 | 
| -        if (exceptionState.hadException())
 | 
| -            return;
 | 
| -        impl.setDouble(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| -
 | 
| -    {
 | 
| -        V8StringResource<> cppValue = v8Value;
 | 
| -        if (!cppValue.prepare(exceptionState))
 | 
| -            return;
 | 
| -        impl.setString(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| +void V8StringOrDouble::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, StringOrDouble& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState) {
 | 
| +  if (v8Value.IsEmpty())
 | 
| +    return;
 | 
| +
 | 
| +  if (conversionMode == UnionTypeConversionMode::Nullable && isUndefinedOrNull(v8Value))
 | 
| +    return;
 | 
| +
 | 
| +  if (v8Value->IsNumber()) {
 | 
| +    double cppValue = toRestrictedDouble(isolate, v8Value, exceptionState);
 | 
| +    if (exceptionState.hadException())
 | 
| +      return;
 | 
| +    impl.setDouble(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  {
 | 
| +    V8StringResource<> cppValue = v8Value;
 | 
| +    if (!cppValue.prepare(exceptionState))
 | 
| +      return;
 | 
| +    impl.setString(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
|  }
 | 
|  
 | 
| -v8::Local<v8::Value> toV8(const StringOrDouble& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)
 | 
| -{
 | 
| -    switch (impl.m_type) {
 | 
| +v8::Local<v8::Value> toV8(const StringOrDouble& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) {
 | 
| +  switch (impl.m_type) {
 | 
|      case StringOrDouble::SpecificTypeNone:
 | 
| -        return v8::Null(isolate);
 | 
| +      return v8::Null(isolate);
 | 
|      case StringOrDouble::SpecificTypeString:
 | 
| -        return v8String(isolate, impl.getAsString());
 | 
| +      return v8String(isolate, impl.getAsString());
 | 
|      case StringOrDouble::SpecificTypeDouble:
 | 
| -        return v8::Number::New(isolate, impl.getAsDouble());
 | 
| +      return v8::Number::New(isolate, impl.getAsDouble());
 | 
|      default:
 | 
| -        ASSERT_NOT_REACHED();
 | 
| -    }
 | 
| -    return v8::Local<v8::Value>();
 | 
| +      NOTREACHED();
 | 
| +  }
 | 
| +  return v8::Local<v8::Value>();
 | 
|  }
 | 
|  
 | 
| -StringOrDouble NativeValueTraits<StringOrDouble>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState)
 | 
| -{
 | 
| -    StringOrDouble impl;
 | 
| -    V8StringOrDouble::toImpl(isolate, value, impl, UnionTypeConversionMode::NotNullable, exceptionState);
 | 
| -    return impl;
 | 
| +StringOrDouble NativeValueTraits<StringOrDouble>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState) {
 | 
| +  StringOrDouble impl;
 | 
| +  V8StringOrDouble::toImpl(isolate, value, impl, UnionTypeConversionMode::NotNullable, exceptionState);
 | 
| +  return impl;
 | 
|  }
 | 
|  
 | 
| -} // namespace blink
 | 
| +}  // namespace blink
 | 
| 
 |