| Index: third_party/WebKit/Source/bindings/tests/results/core/TestEnumOrDouble.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/TestEnumOrDouble.cpp b/third_party/WebKit/Source/bindings/tests/results/core/TestEnumOrDouble.cpp
|
| index 4b4423e9e446713e6dce96ee9d33e704f9bd5a7c..47733efcc9d2e538f1a611c66d4b22c88f1b5089 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/TestEnumOrDouble.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/TestEnumOrDouble.cpp
|
| @@ -19,6 +19,23 @@ namespace blink {
|
|
|
| TestEnumOrDouble::TestEnumOrDouble() : m_type(SpecificTypeNone) {}
|
|
|
| +double TestEnumOrDouble::getAsDouble() const {
|
| + DCHECK(isDouble());
|
| + return m_double;
|
| +}
|
| +
|
| +void TestEnumOrDouble::setDouble(double value) {
|
| + DCHECK(isNull());
|
| + m_double = value;
|
| + m_type = SpecificTypeDouble;
|
| +}
|
| +
|
| +TestEnumOrDouble TestEnumOrDouble::fromDouble(double value) {
|
| + TestEnumOrDouble container;
|
| + container.setDouble(value);
|
| + return container;
|
| +}
|
| +
|
| String TestEnumOrDouble::getAsTestEnum() const {
|
| DCHECK(isTestEnum());
|
| return m_testEnum;
|
| @@ -47,23 +64,6 @@ TestEnumOrDouble TestEnumOrDouble::fromTestEnum(String value) {
|
| return container;
|
| }
|
|
|
| -double TestEnumOrDouble::getAsDouble() const {
|
| - DCHECK(isDouble());
|
| - return m_double;
|
| -}
|
| -
|
| -void TestEnumOrDouble::setDouble(double value) {
|
| - DCHECK(isNull());
|
| - m_double = value;
|
| - m_type = SpecificTypeDouble;
|
| -}
|
| -
|
| -TestEnumOrDouble TestEnumOrDouble::fromDouble(double value) {
|
| - TestEnumOrDouble container;
|
| - container.setDouble(value);
|
| - return container;
|
| -}
|
| -
|
| TestEnumOrDouble::TestEnumOrDouble(const TestEnumOrDouble&) = default;
|
| TestEnumOrDouble::~TestEnumOrDouble() = default;
|
| TestEnumOrDouble& TestEnumOrDouble::operator=(const TestEnumOrDouble&) = default;
|
| @@ -107,10 +107,10 @@ v8::Local<v8::Value> ToV8(const TestEnumOrDouble& impl, v8::Local<v8::Object> cr
|
| switch (impl.m_type) {
|
| case TestEnumOrDouble::SpecificTypeNone:
|
| return v8::Null(isolate);
|
| - case TestEnumOrDouble::SpecificTypeTestEnum:
|
| - return v8String(isolate, impl.getAsTestEnum());
|
| case TestEnumOrDouble::SpecificTypeDouble:
|
| return v8::Number::New(isolate, impl.getAsDouble());
|
| + case TestEnumOrDouble::SpecificTypeTestEnum:
|
| + return v8String(isolate, impl.getAsTestEnum());
|
| default:
|
| NOTREACHED();
|
| }
|
|
|