| Index: third_party/WebKit/Source/bindings/tests/results/core/LongOrTestDictionary.h
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/LongOrTestDictionary.h b/third_party/WebKit/Source/bindings/tests/results/core/LongOrTestDictionary.h
|
| index 7b63c161b9355cfd10eec8a064dd7d1f1d65c6c8..10563e1a2bdc652f620fd1871b017db22e1ffdd5 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/LongOrTestDictionary.h
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/LongOrTestDictionary.h
|
| @@ -18,59 +18,58 @@
|
| namespace blink {
|
|
|
| class CORE_EXPORT LongOrTestDictionary final {
|
| - DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| -public:
|
| - LongOrTestDictionary();
|
| - bool isNull() const { return m_type == SpecificTypeNone; }
|
| -
|
| - bool isLong() const { return m_type == SpecificTypeLong; }
|
| - int getAsLong() const;
|
| - void setLong(int);
|
| - static LongOrTestDictionary fromLong(int);
|
| -
|
| - bool isTestDictionary() const { return m_type == SpecificTypeTestDictionary; }
|
| - const TestDictionary& getAsTestDictionary() const;
|
| - void setTestDictionary(const TestDictionary&);
|
| - static LongOrTestDictionary fromTestDictionary(const TestDictionary&);
|
| -
|
| - LongOrTestDictionary(const LongOrTestDictionary&);
|
| - ~LongOrTestDictionary();
|
| - LongOrTestDictionary& operator=(const LongOrTestDictionary&);
|
| - DECLARE_TRACE();
|
| -
|
| -private:
|
| - enum SpecificTypes {
|
| - SpecificTypeNone,
|
| - SpecificTypeLong,
|
| - SpecificTypeTestDictionary,
|
| - };
|
| - SpecificTypes m_type;
|
| -
|
| - int m_long;
|
| - TestDictionary m_testDictionary;
|
| -
|
| - friend CORE_EXPORT v8::Local<v8::Value> toV8(const LongOrTestDictionary&, v8::Local<v8::Object>, v8::Isolate*);
|
| + DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| + public:
|
| + LongOrTestDictionary();
|
| + bool isNull() const { return m_type == SpecificTypeNone; }
|
| +
|
| + bool isLong() const { return m_type == SpecificTypeLong; }
|
| + int getAsLong() const;
|
| + void setLong(int);
|
| + static LongOrTestDictionary fromLong(int);
|
| +
|
| + bool isTestDictionary() const { return m_type == SpecificTypeTestDictionary; }
|
| + const TestDictionary& getAsTestDictionary() const;
|
| + void setTestDictionary(const TestDictionary&);
|
| + static LongOrTestDictionary fromTestDictionary(const TestDictionary&);
|
| +
|
| + LongOrTestDictionary(const LongOrTestDictionary&);
|
| + ~LongOrTestDictionary();
|
| + LongOrTestDictionary& operator=(const LongOrTestDictionary&);
|
| + DECLARE_TRACE();
|
| +
|
| + private:
|
| + enum SpecificTypes {
|
| + SpecificTypeNone,
|
| + SpecificTypeLong,
|
| + SpecificTypeTestDictionary,
|
| + };
|
| + SpecificTypes m_type;
|
| +
|
| + int m_long;
|
| + TestDictionary m_testDictionary;
|
| +
|
| + friend CORE_EXPORT v8::Local<v8::Value> toV8(const LongOrTestDictionary&, v8::Local<v8::Object>, v8::Isolate*);
|
| };
|
|
|
| class V8LongOrTestDictionary final {
|
| -public:
|
| - CORE_EXPORT static void toImpl(v8::Isolate*, v8::Local<v8::Value>, LongOrTestDictionary&, UnionTypeConversionMode, ExceptionState&);
|
| + public:
|
| + CORE_EXPORT static void toImpl(v8::Isolate*, v8::Local<v8::Value>, LongOrTestDictionary&, UnionTypeConversionMode, ExceptionState&);
|
| };
|
|
|
| CORE_EXPORT v8::Local<v8::Value> toV8(const LongOrTestDictionary&, v8::Local<v8::Object>, v8::Isolate*);
|
|
|
| template <class CallbackInfo>
|
| -inline void v8SetReturnValue(const CallbackInfo& callbackInfo, LongOrTestDictionary& impl)
|
| -{
|
| - v8SetReturnValue(callbackInfo, toV8(impl, callbackInfo.Holder(), callbackInfo.GetIsolate()));
|
| +inline void v8SetReturnValue(const CallbackInfo& callbackInfo, LongOrTestDictionary& impl) {
|
| + v8SetReturnValue(callbackInfo, toV8(impl, callbackInfo.Holder(), callbackInfo.GetIsolate()));
|
| }
|
|
|
| template <>
|
| struct NativeValueTraits<LongOrTestDictionary> {
|
| - CORE_EXPORT static LongOrTestDictionary nativeValue(v8::Isolate*, v8::Local<v8::Value>, ExceptionState&);
|
| + CORE_EXPORT static LongOrTestDictionary 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
|
| @@ -78,4 +77,4 @@ struct NativeValueTraits<LongOrTestDictionary> {
|
| // See https://codereview.chromium.org/1118993002/#msg5 for more details.
|
| WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::LongOrTestDictionary);
|
|
|
| -#endif // LongOrTestDictionary_h
|
| +#endif // LongOrTestDictionary_h
|
|
|