| 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 324b4ee2b8fbfaa0d30bd807b18b6f07f847012f..c2b1aadbf12b980d635a46d956c34f6c0b907459 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.h
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.h
|
| @@ -20,66 +20,65 @@ class TestArrayBuffer;
|
| class TestArrayBufferView;
|
|
|
| class CORE_EXPORT StringOrArrayBufferOrArrayBufferView final {
|
| - DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| -public:
|
| - 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*);
|
| - static StringOrArrayBufferOrArrayBufferView fromArrayBuffer(TestArrayBuffer*);
|
| -
|
| - bool isArrayBufferView() const { return m_type == SpecificTypeArrayBufferView; }
|
| - TestArrayBufferView* getAsArrayBufferView() const;
|
| - void setArrayBufferView(TestArrayBufferView*);
|
| - static StringOrArrayBufferOrArrayBufferView fromArrayBufferView(TestArrayBufferView*);
|
| -
|
| - StringOrArrayBufferOrArrayBufferView(const StringOrArrayBufferOrArrayBufferView&);
|
| - ~StringOrArrayBufferOrArrayBufferView();
|
| - StringOrArrayBufferOrArrayBufferView& operator=(const StringOrArrayBufferOrArrayBufferView&);
|
| - DECLARE_TRACE();
|
| -
|
| -private:
|
| - enum SpecificTypes {
|
| - SpecificTypeNone,
|
| - SpecificTypeString,
|
| - SpecificTypeArrayBuffer,
|
| - SpecificTypeArrayBufferView,
|
| - };
|
| - SpecificTypes m_type;
|
| -
|
| - String m_string;
|
| - Member<TestArrayBuffer> m_arrayBuffer;
|
| - Member<TestArrayBufferView> m_arrayBufferView;
|
| -
|
| - friend CORE_EXPORT v8::Local<v8::Value> toV8(const StringOrArrayBufferOrArrayBufferView&, v8::Local<v8::Object>, v8::Isolate*);
|
| + DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| + public:
|
| + 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*);
|
| + static StringOrArrayBufferOrArrayBufferView fromArrayBuffer(TestArrayBuffer*);
|
| +
|
| + bool isArrayBufferView() const { return m_type == SpecificTypeArrayBufferView; }
|
| + TestArrayBufferView* getAsArrayBufferView() const;
|
| + void setArrayBufferView(TestArrayBufferView*);
|
| + static StringOrArrayBufferOrArrayBufferView fromArrayBufferView(TestArrayBufferView*);
|
| +
|
| + StringOrArrayBufferOrArrayBufferView(const StringOrArrayBufferOrArrayBufferView&);
|
| + ~StringOrArrayBufferOrArrayBufferView();
|
| + StringOrArrayBufferOrArrayBufferView& operator=(const StringOrArrayBufferOrArrayBufferView&);
|
| + DECLARE_TRACE();
|
| +
|
| + private:
|
| + enum SpecificTypes {
|
| + SpecificTypeNone,
|
| + SpecificTypeString,
|
| + SpecificTypeArrayBuffer,
|
| + SpecificTypeArrayBufferView,
|
| + };
|
| + SpecificTypes m_type;
|
| +
|
| + String m_string;
|
| + Member<TestArrayBuffer> m_arrayBuffer;
|
| + Member<TestArrayBufferView> m_arrayBufferView;
|
| +
|
| + friend CORE_EXPORT v8::Local<v8::Value> toV8(const StringOrArrayBufferOrArrayBufferView&, v8::Local<v8::Object>, v8::Isolate*);
|
| };
|
|
|
| class V8StringOrArrayBufferOrArrayBufferView final {
|
| -public:
|
| - CORE_EXPORT static void toImpl(v8::Isolate*, v8::Local<v8::Value>, StringOrArrayBufferOrArrayBufferView&, UnionTypeConversionMode, ExceptionState&);
|
| + public:
|
| + CORE_EXPORT static void toImpl(v8::Isolate*, v8::Local<v8::Value>, StringOrArrayBufferOrArrayBufferView&, UnionTypeConversionMode, ExceptionState&);
|
| };
|
|
|
| CORE_EXPORT v8::Local<v8::Value> toV8(const StringOrArrayBufferOrArrayBufferView&, v8::Local<v8::Object>, v8::Isolate*);
|
|
|
| template <class CallbackInfo>
|
| -inline void v8SetReturnValue(const CallbackInfo& callbackInfo, StringOrArrayBufferOrArrayBufferView& impl)
|
| -{
|
| - v8SetReturnValue(callbackInfo, toV8(impl, callbackInfo.Holder(), callbackInfo.GetIsolate()));
|
| +inline void v8SetReturnValue(const CallbackInfo& callbackInfo, StringOrArrayBufferOrArrayBufferView& impl) {
|
| + v8SetReturnValue(callbackInfo, toV8(impl, callbackInfo.Holder(), callbackInfo.GetIsolate()));
|
| }
|
|
|
| template <>
|
| struct NativeValueTraits<StringOrArrayBufferOrArrayBufferView> {
|
| - CORE_EXPORT static StringOrArrayBufferOrArrayBufferView nativeValue(v8::Isolate*, v8::Local<v8::Value>, ExceptionState&);
|
| + CORE_EXPORT static StringOrArrayBufferOrArrayBufferView nativeValue(v8::Isolate*, v8::Local<v8::Value>, ExceptionState&);
|
| };
|
|
|
| -} // namespace blink
|
| +} // namespace blink
|
|
|
| // We need to set canInitializeWithMemset=true because HeapVector supports
|
| // items that can initialize with memset or have a vtable. It is safe to
|
| @@ -87,4 +86,4 @@ struct NativeValueTraits<StringOrArrayBufferOrArrayBufferView> {
|
| // See https://codereview.chromium.org/1118993002/#msg5 for more details.
|
| WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::StringOrArrayBufferOrArrayBufferView);
|
|
|
| -#endif // StringOrArrayBufferOrArrayBufferView_h
|
| +#endif // StringOrArrayBufferOrArrayBufferView_h
|
|
|