| Index: third_party/WebKit/Source/bindings/core/v8/NativeValueTraitsImpl.h
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/NativeValueTraitsImpl.h b/third_party/WebKit/Source/bindings/core/v8/NativeValueTraitsImpl.h
|
| index ca596228c5f29f91007c89f0ded32eb8e262ec39..3fc5b6d638b95001c60204c2303288050e40c297 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/NativeValueTraitsImpl.h
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/NativeValueTraitsImpl.h
|
| @@ -17,9 +17,9 @@ namespace blink {
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLBoolean>
|
| : public NativeValueTraitsBase<IDLBoolean> {
|
| - static inline bool nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static bool nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return toBoolean(isolate, value, exceptionState);
|
| }
|
| };
|
| @@ -33,17 +33,16 @@ struct CORE_EXPORT NativeValueTraits<IDLBoolean>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLByte>
|
| : public NativeValueTraitsBase<IDLByte> {
|
| - static inline int8_t nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static int8_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue(isolate, value, exceptionState, NormalConversion);
|
| }
|
|
|
| - static inline int8_t nativeValue(
|
| - v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState,
|
| - IntegerConversionConfiguration conversionMode) {
|
| + static int8_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState,
|
| + IntegerConversionConfiguration conversionMode) {
|
| return toInt8(isolate, value, conversionMode, exceptionState);
|
| }
|
| };
|
| @@ -51,17 +50,16 @@ struct CORE_EXPORT NativeValueTraits<IDLByte>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLOctet>
|
| : public NativeValueTraitsBase<IDLOctet> {
|
| - static inline uint8_t nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static uint8_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue(isolate, value, exceptionState, NormalConversion);
|
| }
|
|
|
| - static inline uint8_t nativeValue(
|
| - v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState,
|
| - IntegerConversionConfiguration conversionMode) {
|
| + static uint8_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState,
|
| + IntegerConversionConfiguration conversionMode) {
|
| return toUInt8(isolate, value, conversionMode, exceptionState);
|
| }
|
| };
|
| @@ -69,17 +67,16 @@ struct CORE_EXPORT NativeValueTraits<IDLOctet>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLShort>
|
| : public NativeValueTraitsBase<IDLShort> {
|
| - static inline int16_t nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static int16_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue(isolate, value, exceptionState, NormalConversion);
|
| }
|
|
|
| - static inline int16_t nativeValue(
|
| - v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState,
|
| - IntegerConversionConfiguration conversionMode) {
|
| + static int16_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState,
|
| + IntegerConversionConfiguration conversionMode) {
|
| return toInt16(isolate, value, conversionMode, exceptionState);
|
| }
|
| };
|
| @@ -87,17 +84,16 @@ struct CORE_EXPORT NativeValueTraits<IDLShort>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLUnsignedShort>
|
| : public NativeValueTraitsBase<IDLUnsignedShort> {
|
| - static inline uint16_t nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static uint16_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue(isolate, value, exceptionState, NormalConversion);
|
| }
|
|
|
| - static inline uint16_t nativeValue(
|
| - v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState,
|
| - IntegerConversionConfiguration conversionMode) {
|
| + static uint16_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState,
|
| + IntegerConversionConfiguration conversionMode) {
|
| return toUInt16(isolate, value, conversionMode, exceptionState);
|
| }
|
| };
|
| @@ -105,17 +101,16 @@ struct CORE_EXPORT NativeValueTraits<IDLUnsignedShort>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLLong>
|
| : public NativeValueTraitsBase<IDLLong> {
|
| - static inline int32_t nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static int32_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue(isolate, value, exceptionState, NormalConversion);
|
| }
|
|
|
| - static inline int32_t nativeValue(
|
| - v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState,
|
| - IntegerConversionConfiguration conversionMode) {
|
| + static int32_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState,
|
| + IntegerConversionConfiguration conversionMode) {
|
| return toInt32(isolate, value, conversionMode, exceptionState);
|
| }
|
| };
|
| @@ -123,17 +118,16 @@ struct CORE_EXPORT NativeValueTraits<IDLLong>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLUnsignedLong>
|
| : public NativeValueTraitsBase<IDLUnsignedLong> {
|
| - static inline uint32_t nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static uint32_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue(isolate, value, exceptionState, NormalConversion);
|
| }
|
|
|
| - static inline uint32_t nativeValue(
|
| - v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState,
|
| - IntegerConversionConfiguration conversionMode) {
|
| + static uint32_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState,
|
| + IntegerConversionConfiguration conversionMode) {
|
| return toUInt32(isolate, value, conversionMode, exceptionState);
|
| }
|
| };
|
| @@ -141,17 +135,16 @@ struct CORE_EXPORT NativeValueTraits<IDLUnsignedLong>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLLongLong>
|
| : public NativeValueTraitsBase<IDLLongLong> {
|
| - static inline int64_t nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static int64_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue(isolate, value, exceptionState, NormalConversion);
|
| }
|
|
|
| - static inline int64_t nativeValue(
|
| - v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState,
|
| - IntegerConversionConfiguration conversionMode) {
|
| + static int64_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState,
|
| + IntegerConversionConfiguration conversionMode) {
|
| return toInt64(isolate, value, conversionMode, exceptionState);
|
| }
|
| };
|
| @@ -159,17 +152,16 @@ struct CORE_EXPORT NativeValueTraits<IDLLongLong>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLUnsignedLongLong>
|
| : public NativeValueTraitsBase<IDLUnsignedLongLong> {
|
| - static inline uint64_t nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static uint64_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue(isolate, value, exceptionState, NormalConversion);
|
| }
|
|
|
| - static inline uint64_t nativeValue(
|
| - v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState,
|
| - IntegerConversionConfiguration conversionMode) {
|
| + static uint64_t nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState,
|
| + IntegerConversionConfiguration conversionMode) {
|
| return toUInt64(isolate, value, conversionMode, exceptionState);
|
| }
|
| };
|
| @@ -178,9 +170,9 @@ struct CORE_EXPORT NativeValueTraits<IDLUnsignedLongLong>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLByteString>
|
| : public NativeValueTraitsBase<IDLByteString> {
|
| - static inline String nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static String nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return toByteString(isolate, value, exceptionState);
|
| }
|
| };
|
| @@ -188,17 +180,17 @@ struct CORE_EXPORT NativeValueTraits<IDLByteString>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLString>
|
| : public NativeValueTraitsBase<IDLString> {
|
| - static inline String nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static String nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue<V8StringResourceMode::DefaultMode>(isolate, value,
|
| exceptionState);
|
| }
|
|
|
| template <V8StringResourceMode Mode = DefaultMode>
|
| - static inline String nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static String nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| V8StringResource<Mode> string(value);
|
| if (!string.prepare(isolate, exceptionState))
|
| return String();
|
| @@ -209,9 +201,9 @@ struct CORE_EXPORT NativeValueTraits<IDLString>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLUSVString>
|
| : public NativeValueTraitsBase<IDLUSVString> {
|
| - static inline String nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static String nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return toUSVString(isolate, value, exceptionState);
|
| }
|
| };
|
| @@ -220,9 +212,9 @@ struct CORE_EXPORT NativeValueTraits<IDLUSVString>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLDouble>
|
| : public NativeValueTraitsBase<IDLDouble> {
|
| - static inline double nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static double nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return toRestrictedDouble(isolate, value, exceptionState);
|
| }
|
| };
|
| @@ -230,9 +222,9 @@ struct CORE_EXPORT NativeValueTraits<IDLDouble>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLUnrestrictedDouble>
|
| : public NativeValueTraitsBase<IDLUnrestrictedDouble> {
|
| - static inline double nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static double nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return toDouble(isolate, value, exceptionState);
|
| }
|
| };
|
| @@ -240,9 +232,9 @@ struct CORE_EXPORT NativeValueTraits<IDLUnrestrictedDouble>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLFloat>
|
| : public NativeValueTraitsBase<IDLFloat> {
|
| - static inline float nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static float nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return toRestrictedFloat(isolate, value, exceptionState);
|
| }
|
| };
|
| @@ -250,9 +242,9 @@ struct CORE_EXPORT NativeValueTraits<IDLFloat>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLUnrestrictedFloat>
|
| : public NativeValueTraitsBase<IDLUnrestrictedFloat> {
|
| - static inline float nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static float nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return toFloat(isolate, value, exceptionState);
|
| }
|
| };
|
| @@ -261,14 +253,14 @@ struct CORE_EXPORT NativeValueTraits<IDLUnrestrictedFloat>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLPromise>
|
| : public NativeValueTraitsBase<IDLPromise> {
|
| - static inline ScriptPromise nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static ScriptPromise nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue(isolate, value);
|
| }
|
|
|
| - static inline ScriptPromise nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value) {
|
| + static ScriptPromise nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value) {
|
| return ScriptPromise::cast(ScriptState::current(isolate), value);
|
| }
|
| };
|
| @@ -277,9 +269,9 @@ struct CORE_EXPORT NativeValueTraits<IDLPromise>
|
| template <>
|
| struct CORE_EXPORT NativeValueTraits<IDLDate>
|
| : public NativeValueTraitsBase<IDLDate> {
|
| - static inline double nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static double nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return toCoreDate(isolate, value, exceptionState);
|
| }
|
| };
|
| @@ -291,16 +283,16 @@ struct NativeValueTraits<IDLSequence<T>>
|
| // Nondependent types need to be explicitly qualified to be accessible.
|
| using typename NativeValueTraitsBase<IDLSequence<T>>::ImplType;
|
|
|
| - static inline ImplType nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState) {
|
| + static ImplType nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState) {
|
| return nativeValue(isolate, value, exceptionState, 0);
|
| }
|
|
|
| - static inline ImplType nativeValue(v8::Isolate* isolate,
|
| - v8::Local<v8::Value> value,
|
| - ExceptionState& exceptionState,
|
| - int index) {
|
| + static ImplType nativeValue(v8::Isolate* isolate,
|
| + v8::Local<v8::Value> value,
|
| + ExceptionState& exceptionState,
|
| + int index) {
|
| return toImplArray<ImplType, T>(value, index, isolate, exceptionState);
|
| }
|
| };
|
|
|