| Index: third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.cpp b/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.cpp
|
| index c9c8bddef7fa6bc05de4114f75ad233a39eaedef..56335f52e2ff2ef13daaf59fe686583a68e2083f 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.cpp
|
| @@ -22,23 +22,6 @@ namespace blink {
|
|
|
| StringOrArrayBufferOrArrayBufferView::StringOrArrayBufferOrArrayBufferView() : m_type(SpecificTypeNone) {}
|
|
|
| -String StringOrArrayBufferOrArrayBufferView::getAsString() const {
|
| - DCHECK(isString());
|
| - return m_string;
|
| -}
|
| -
|
| -void StringOrArrayBufferOrArrayBufferView::setString(String value) {
|
| - DCHECK(isNull());
|
| - m_string = value;
|
| - m_type = SpecificTypeString;
|
| -}
|
| -
|
| -StringOrArrayBufferOrArrayBufferView StringOrArrayBufferOrArrayBufferView::fromString(String value) {
|
| - StringOrArrayBufferOrArrayBufferView container;
|
| - container.setString(value);
|
| - return container;
|
| -}
|
| -
|
| TestArrayBuffer* StringOrArrayBufferOrArrayBufferView::getAsArrayBuffer() const {
|
| DCHECK(isArrayBuffer());
|
| return m_arrayBuffer;
|
| @@ -73,6 +56,23 @@ StringOrArrayBufferOrArrayBufferView StringOrArrayBufferOrArrayBufferView::fromA
|
| return container;
|
| }
|
|
|
| +String StringOrArrayBufferOrArrayBufferView::getAsString() const {
|
| + DCHECK(isString());
|
| + return m_string;
|
| +}
|
| +
|
| +void StringOrArrayBufferOrArrayBufferView::setString(String value) {
|
| + DCHECK(isNull());
|
| + m_string = value;
|
| + m_type = SpecificTypeString;
|
| +}
|
| +
|
| +StringOrArrayBufferOrArrayBufferView StringOrArrayBufferOrArrayBufferView::fromString(String value) {
|
| + StringOrArrayBufferOrArrayBufferView container;
|
| + container.setString(value);
|
| + return container;
|
| +}
|
| +
|
| StringOrArrayBufferOrArrayBufferView::StringOrArrayBufferOrArrayBufferView(const StringOrArrayBufferOrArrayBufferView&) = default;
|
| StringOrArrayBufferOrArrayBufferView::~StringOrArrayBufferOrArrayBufferView() = default;
|
| StringOrArrayBufferOrArrayBufferView& StringOrArrayBufferOrArrayBufferView::operator=(const StringOrArrayBufferOrArrayBufferView&) = default;
|
| @@ -114,12 +114,12 @@ v8::Local<v8::Value> ToV8(const StringOrArrayBufferOrArrayBufferView& impl, v8::
|
| switch (impl.m_type) {
|
| case StringOrArrayBufferOrArrayBufferView::SpecificTypeNone:
|
| return v8::Null(isolate);
|
| - case StringOrArrayBufferOrArrayBufferView::SpecificTypeString:
|
| - return v8String(isolate, impl.getAsString());
|
| case StringOrArrayBufferOrArrayBufferView::SpecificTypeArrayBuffer:
|
| return ToV8(impl.getAsArrayBuffer(), creationContext, isolate);
|
| case StringOrArrayBufferOrArrayBufferView::SpecificTypeArrayBufferView:
|
| return ToV8(impl.getAsArrayBufferView(), creationContext, isolate);
|
| + case StringOrArrayBufferOrArrayBufferView::SpecificTypeString:
|
| + return v8String(isolate, impl.getAsString());
|
| default:
|
| NOTREACHED();
|
| }
|
|
|