| Index: third_party/WebKit/Source/bindings/tests/results/core/StringOrStringSequence.h
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/StringOrStringSequence.h b/third_party/WebKit/Source/bindings/tests/results/core/StringOrStringSequence.h
|
| index 35ab10223d0ebe1aeaf08694809a65899770396f..6765006448b54eab21c47e8c746006e2b4f37dd7 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/StringOrStringSequence.h
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/StringOrStringSequence.h
|
| @@ -17,59 +17,58 @@
|
| namespace blink {
|
|
|
| class CORE_EXPORT StringOrStringSequence final {
|
| - DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| -public:
|
| - StringOrStringSequence();
|
| - bool isNull() const { return m_type == SpecificTypeNone; }
|
| -
|
| - bool isString() const { return m_type == SpecificTypeString; }
|
| - String getAsString() const;
|
| - void setString(String);
|
| - static StringOrStringSequence fromString(String);
|
| -
|
| - bool isStringSequence() const { return m_type == SpecificTypeStringSequence; }
|
| - const Vector<String>& getAsStringSequence() const;
|
| - void setStringSequence(const Vector<String>&);
|
| - static StringOrStringSequence fromStringSequence(const Vector<String>&);
|
| -
|
| - StringOrStringSequence(const StringOrStringSequence&);
|
| - ~StringOrStringSequence();
|
| - StringOrStringSequence& operator=(const StringOrStringSequence&);
|
| - DECLARE_TRACE();
|
| -
|
| -private:
|
| - enum SpecificTypes {
|
| - SpecificTypeNone,
|
| - SpecificTypeString,
|
| - SpecificTypeStringSequence,
|
| - };
|
| - SpecificTypes m_type;
|
| -
|
| - String m_string;
|
| - Vector<String> m_stringSequence;
|
| -
|
| - friend CORE_EXPORT v8::Local<v8::Value> toV8(const StringOrStringSequence&, v8::Local<v8::Object>, v8::Isolate*);
|
| + DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| + public:
|
| + StringOrStringSequence();
|
| + bool isNull() const { return m_type == SpecificTypeNone; }
|
| +
|
| + bool isString() const { return m_type == SpecificTypeString; }
|
| + String getAsString() const;
|
| + void setString(String);
|
| + static StringOrStringSequence fromString(String);
|
| +
|
| + bool isStringSequence() const { return m_type == SpecificTypeStringSequence; }
|
| + const Vector<String>& getAsStringSequence() const;
|
| + void setStringSequence(const Vector<String>&);
|
| + static StringOrStringSequence fromStringSequence(const Vector<String>&);
|
| +
|
| + StringOrStringSequence(const StringOrStringSequence&);
|
| + ~StringOrStringSequence();
|
| + StringOrStringSequence& operator=(const StringOrStringSequence&);
|
| + DECLARE_TRACE();
|
| +
|
| + private:
|
| + enum SpecificTypes {
|
| + SpecificTypeNone,
|
| + SpecificTypeString,
|
| + SpecificTypeStringSequence,
|
| + };
|
| + SpecificTypes m_type;
|
| +
|
| + String m_string;
|
| + Vector<String> m_stringSequence;
|
| +
|
| + friend CORE_EXPORT v8::Local<v8::Value> toV8(const StringOrStringSequence&, v8::Local<v8::Object>, v8::Isolate*);
|
| };
|
|
|
| class V8StringOrStringSequence final {
|
| -public:
|
| - CORE_EXPORT static void toImpl(v8::Isolate*, v8::Local<v8::Value>, StringOrStringSequence&, UnionTypeConversionMode, ExceptionState&);
|
| + public:
|
| + CORE_EXPORT static void toImpl(v8::Isolate*, v8::Local<v8::Value>, StringOrStringSequence&, UnionTypeConversionMode, ExceptionState&);
|
| };
|
|
|
| CORE_EXPORT v8::Local<v8::Value> toV8(const StringOrStringSequence&, v8::Local<v8::Object>, v8::Isolate*);
|
|
|
| template <class CallbackInfo>
|
| -inline void v8SetReturnValue(const CallbackInfo& callbackInfo, StringOrStringSequence& impl)
|
| -{
|
| - v8SetReturnValue(callbackInfo, toV8(impl, callbackInfo.Holder(), callbackInfo.GetIsolate()));
|
| +inline void v8SetReturnValue(const CallbackInfo& callbackInfo, StringOrStringSequence& impl) {
|
| + v8SetReturnValue(callbackInfo, toV8(impl, callbackInfo.Holder(), callbackInfo.GetIsolate()));
|
| }
|
|
|
| template <>
|
| struct NativeValueTraits<StringOrStringSequence> {
|
| - CORE_EXPORT static StringOrStringSequence nativeValue(v8::Isolate*, v8::Local<v8::Value>, ExceptionState&);
|
| + CORE_EXPORT static StringOrStringSequence 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
|
| @@ -77,4 +76,4 @@ struct NativeValueTraits<StringOrStringSequence> {
|
| // See https://codereview.chromium.org/1118993002/#msg5 for more details.
|
| WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::StringOrStringSequence);
|
|
|
| -#endif // StringOrStringSequence_h
|
| +#endif // StringOrStringSequence_h
|
|
|