| Index: third_party/WebKit/Source/bindings/tests/results/modules/BooleanOrString.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/modules/BooleanOrString.cpp b/third_party/WebKit/Source/bindings/tests/results/modules/BooleanOrString.cpp
|
| index d2a8ba59c7209e4841a34bbcd27afc189301327a..8aa9cd35b23ef6936bd6064dcffa2a0fe8fc16df 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/modules/BooleanOrString.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/modules/BooleanOrString.cpp
|
| @@ -11,101 +11,88 @@
|
|
|
| namespace blink {
|
|
|
| -BooleanOrString::BooleanOrString()
|
| - : m_type(SpecificTypeNone)
|
| -{
|
| -}
|
| +BooleanOrString::BooleanOrString() : m_type(SpecificTypeNone) {}
|
|
|
| -bool BooleanOrString::getAsBoolean() const
|
| -{
|
| - ASSERT(isBoolean());
|
| - return m_boolean;
|
| +bool BooleanOrString::getAsBoolean() const {
|
| + DCHECK(isBoolean());
|
| + return m_boolean;
|
| }
|
|
|
| -void BooleanOrString::setBoolean(bool value)
|
| -{
|
| - ASSERT(isNull());
|
| - m_boolean = value;
|
| - m_type = SpecificTypeBoolean;
|
| +void BooleanOrString::setBoolean(bool value) {
|
| + DCHECK(isNull());
|
| + m_boolean = value;
|
| + m_type = SpecificTypeBoolean;
|
| }
|
|
|
| -BooleanOrString BooleanOrString::fromBoolean(bool value)
|
| -{
|
| - BooleanOrString container;
|
| - container.setBoolean(value);
|
| - return container;
|
| +BooleanOrString BooleanOrString::fromBoolean(bool value) {
|
| + BooleanOrString container;
|
| + container.setBoolean(value);
|
| + return container;
|
| }
|
|
|
| -String BooleanOrString::getAsString() const
|
| -{
|
| - ASSERT(isString());
|
| - return m_string;
|
| +String BooleanOrString::getAsString() const {
|
| + DCHECK(isString());
|
| + return m_string;
|
| }
|
|
|
| -void BooleanOrString::setString(String value)
|
| -{
|
| - ASSERT(isNull());
|
| - m_string = value;
|
| - m_type = SpecificTypeString;
|
| +void BooleanOrString::setString(String value) {
|
| + DCHECK(isNull());
|
| + m_string = value;
|
| + m_type = SpecificTypeString;
|
| }
|
|
|
| -BooleanOrString BooleanOrString::fromString(String value)
|
| -{
|
| - BooleanOrString container;
|
| - container.setString(value);
|
| - return container;
|
| +BooleanOrString BooleanOrString::fromString(String value) {
|
| + BooleanOrString container;
|
| + container.setString(value);
|
| + return container;
|
| }
|
|
|
| BooleanOrString::BooleanOrString(const BooleanOrString&) = default;
|
| BooleanOrString::~BooleanOrString() = default;
|
| BooleanOrString& BooleanOrString::operator=(const BooleanOrString&) = default;
|
|
|
| -DEFINE_TRACE(BooleanOrString)
|
| -{
|
| +DEFINE_TRACE(BooleanOrString) {
|
| }
|
|
|
| -void V8BooleanOrString::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, BooleanOrString& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState)
|
| -{
|
| - if (v8Value.IsEmpty())
|
| - return;
|
| -
|
| - if (conversionMode == UnionTypeConversionMode::Nullable && isUndefinedOrNull(v8Value))
|
| - return;
|
| -
|
| - if (v8Value->IsBoolean()) {
|
| - impl.setBoolean(v8Value.As<v8::Boolean>()->Value());
|
| - return;
|
| - }
|
| -
|
| - {
|
| - V8StringResource<> cppValue = v8Value;
|
| - if (!cppValue.prepare(exceptionState))
|
| - return;
|
| - impl.setString(cppValue);
|
| - return;
|
| - }
|
| +void V8BooleanOrString::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, BooleanOrString& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState) {
|
| + if (v8Value.IsEmpty())
|
| + return;
|
| +
|
| + if (conversionMode == UnionTypeConversionMode::Nullable && isUndefinedOrNull(v8Value))
|
| + return;
|
| +
|
| + if (v8Value->IsBoolean()) {
|
| + impl.setBoolean(v8Value.As<v8::Boolean>()->Value());
|
| + return;
|
| + }
|
| +
|
| + {
|
| + V8StringResource<> cppValue = v8Value;
|
| + if (!cppValue.prepare(exceptionState))
|
| + return;
|
| + impl.setString(cppValue);
|
| + return;
|
| + }
|
| }
|
|
|
| -v8::Local<v8::Value> toV8(const BooleanOrString& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)
|
| -{
|
| - switch (impl.m_type) {
|
| +v8::Local<v8::Value> toV8(const BooleanOrString& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) {
|
| + switch (impl.m_type) {
|
| case BooleanOrString::SpecificTypeNone:
|
| - return v8::Null(isolate);
|
| + return v8::Null(isolate);
|
| case BooleanOrString::SpecificTypeBoolean:
|
| - return v8Boolean(impl.getAsBoolean(), isolate);
|
| + return v8Boolean(impl.getAsBoolean(), isolate);
|
| case BooleanOrString::SpecificTypeString:
|
| - return v8String(isolate, impl.getAsString());
|
| + return v8String(isolate, impl.getAsString());
|
| default:
|
| - ASSERT_NOT_REACHED();
|
| - }
|
| - return v8::Local<v8::Value>();
|
| + NOTREACHED();
|
| + }
|
| + return v8::Local<v8::Value>();
|
| }
|
|
|
| -BooleanOrString NativeValueTraits<BooleanOrString>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState)
|
| -{
|
| - BooleanOrString impl;
|
| - V8BooleanOrString::toImpl(isolate, value, impl, UnionTypeConversionMode::NotNullable, exceptionState);
|
| - return impl;
|
| +BooleanOrString NativeValueTraits<BooleanOrString>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState) {
|
| + BooleanOrString impl;
|
| + V8BooleanOrString::toImpl(isolate, value, impl, UnionTypeConversionMode::NotNullable, exceptionState);
|
| + return impl;
|
| }
|
|
|
| -} // namespace blink
|
| +} // namespace blink
|
|
|