| Index: third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.h
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.h b/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.h
|
| index 9b39fc0d3479764d90373ed3aaa7963776a8dd3e..94461f44f7458c3fae3a0305532d87f1cf0d1235 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.h
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.h
|
| @@ -30,11 +30,6 @@ class CORE_EXPORT StringOrArrayBufferOrArrayBufferView final {
|
| StringOrArrayBufferOrArrayBufferView();
|
| bool isNull() const { return m_type == SpecificTypeNone; }
|
|
|
| - bool isString() const { return m_type == SpecificTypeString; }
|
| - String getAsString() const;
|
| - void setString(String);
|
| - static StringOrArrayBufferOrArrayBufferView fromString(String);
|
| -
|
| bool isArrayBuffer() const { return m_type == SpecificTypeArrayBuffer; }
|
| TestArrayBuffer* getAsArrayBuffer() const;
|
| void setArrayBuffer(TestArrayBuffer*);
|
| @@ -45,6 +40,11 @@ class CORE_EXPORT StringOrArrayBufferOrArrayBufferView final {
|
| void setArrayBufferView(TestArrayBufferView*);
|
| static StringOrArrayBufferOrArrayBufferView fromArrayBufferView(TestArrayBufferView*);
|
|
|
| + bool isString() const { return m_type == SpecificTypeString; }
|
| + String getAsString() const;
|
| + void setString(String);
|
| + static StringOrArrayBufferOrArrayBufferView fromString(String);
|
| +
|
| StringOrArrayBufferOrArrayBufferView(const StringOrArrayBufferOrArrayBufferView&);
|
| ~StringOrArrayBufferOrArrayBufferView();
|
| StringOrArrayBufferOrArrayBufferView& operator=(const StringOrArrayBufferOrArrayBufferView&);
|
| @@ -53,15 +53,15 @@ class CORE_EXPORT StringOrArrayBufferOrArrayBufferView final {
|
| private:
|
| enum SpecificTypes {
|
| SpecificTypeNone,
|
| - SpecificTypeString,
|
| SpecificTypeArrayBuffer,
|
| SpecificTypeArrayBufferView,
|
| + SpecificTypeString,
|
| };
|
| SpecificTypes m_type;
|
|
|
| - String m_string;
|
| Member<TestArrayBuffer> m_arrayBuffer;
|
| Member<TestArrayBufferView> m_arrayBufferView;
|
| + String m_string;
|
|
|
| friend CORE_EXPORT v8::Local<v8::Value> ToV8(const StringOrArrayBufferOrArrayBufferView&, v8::Local<v8::Object>, v8::Isolate*);
|
| };
|
|
|