| Index: third_party/WebKit/Source/bindings/tests/results/core/TestInterfaceGarbageCollectedOrString.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/TestInterfaceGarbageCollectedOrString.cpp b/third_party/WebKit/Source/bindings/tests/results/core/TestInterfaceGarbageCollectedOrString.cpp
|
| index fa7107f4fcb7901046f59384d2d8d7e7d36070c3..bfe5b9fbd5290a901904381400eed62b36f213d2 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/TestInterfaceGarbageCollectedOrString.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/TestInterfaceGarbageCollectedOrString.cpp
|
| @@ -20,37 +20,37 @@ namespace blink {
|
|
|
| TestInterfaceGarbageCollectedOrString::TestInterfaceGarbageCollectedOrString() : m_type(SpecificTypeNone) {}
|
|
|
| -TestInterfaceGarbageCollected* TestInterfaceGarbageCollectedOrString::getAsTestInterfaceGarbageCollected() const {
|
| - DCHECK(isTestInterfaceGarbageCollected());
|
| - return m_testInterfaceGarbageCollected;
|
| +String TestInterfaceGarbageCollectedOrString::getAsString() const {
|
| + DCHECK(isString());
|
| + return m_string;
|
| }
|
|
|
| -void TestInterfaceGarbageCollectedOrString::setTestInterfaceGarbageCollected(TestInterfaceGarbageCollected* value) {
|
| +void TestInterfaceGarbageCollectedOrString::setString(String value) {
|
| DCHECK(isNull());
|
| - m_testInterfaceGarbageCollected = value;
|
| - m_type = SpecificTypeTestInterfaceGarbageCollected;
|
| + m_string = value;
|
| + m_type = SpecificTypeString;
|
| }
|
|
|
| -TestInterfaceGarbageCollectedOrString TestInterfaceGarbageCollectedOrString::fromTestInterfaceGarbageCollected(TestInterfaceGarbageCollected* value) {
|
| +TestInterfaceGarbageCollectedOrString TestInterfaceGarbageCollectedOrString::fromString(String value) {
|
| TestInterfaceGarbageCollectedOrString container;
|
| - container.setTestInterfaceGarbageCollected(value);
|
| + container.setString(value);
|
| return container;
|
| }
|
|
|
| -String TestInterfaceGarbageCollectedOrString::getAsString() const {
|
| - DCHECK(isString());
|
| - return m_string;
|
| +TestInterfaceGarbageCollected* TestInterfaceGarbageCollectedOrString::getAsTestInterfaceGarbageCollected() const {
|
| + DCHECK(isTestInterfaceGarbageCollected());
|
| + return m_testInterfaceGarbageCollected;
|
| }
|
|
|
| -void TestInterfaceGarbageCollectedOrString::setString(String value) {
|
| +void TestInterfaceGarbageCollectedOrString::setTestInterfaceGarbageCollected(TestInterfaceGarbageCollected* value) {
|
| DCHECK(isNull());
|
| - m_string = value;
|
| - m_type = SpecificTypeString;
|
| + m_testInterfaceGarbageCollected = value;
|
| + m_type = SpecificTypeTestInterfaceGarbageCollected;
|
| }
|
|
|
| -TestInterfaceGarbageCollectedOrString TestInterfaceGarbageCollectedOrString::fromString(String value) {
|
| +TestInterfaceGarbageCollectedOrString TestInterfaceGarbageCollectedOrString::fromTestInterfaceGarbageCollected(TestInterfaceGarbageCollected* value) {
|
| TestInterfaceGarbageCollectedOrString container;
|
| - container.setString(value);
|
| + container.setTestInterfaceGarbageCollected(value);
|
| return container;
|
| }
|
|
|
| @@ -88,10 +88,10 @@ v8::Local<v8::Value> ToV8(const TestInterfaceGarbageCollectedOrString& impl, v8:
|
| switch (impl.m_type) {
|
| case TestInterfaceGarbageCollectedOrString::SpecificTypeNone:
|
| return v8::Null(isolate);
|
| - case TestInterfaceGarbageCollectedOrString::SpecificTypeTestInterfaceGarbageCollected:
|
| - return ToV8(impl.getAsTestInterfaceGarbageCollected(), creationContext, isolate);
|
| case TestInterfaceGarbageCollectedOrString::SpecificTypeString:
|
| return v8String(isolate, impl.getAsString());
|
| + case TestInterfaceGarbageCollectedOrString::SpecificTypeTestInterfaceGarbageCollected:
|
| + return ToV8(impl.getAsTestInterfaceGarbageCollected(), creationContext, isolate);
|
| default:
|
| NOTREACHED();
|
| }
|
|
|