| Index: Source/bindings/core/v8/V8Binding.h
|
| diff --git a/Source/bindings/core/v8/V8Binding.h b/Source/bindings/core/v8/V8Binding.h
|
| index 24329a75cb311f0ee7804dec23f88bb6713fb4e0..37efc1d20368a9ff28c44ab39acd5c95749c2724 100644
|
| --- a/Source/bindings/core/v8/V8Binding.h
|
| +++ b/Source/bindings/core/v8/V8Binding.h
|
| @@ -520,9 +520,9 @@ bool toV8Sequence(v8::Handle<v8::Value>, uint32_t& length, v8::Isolate*, Excepti
|
| // Converts a JavaScript value to an array as per the Web IDL specification:
|
| // http://www.w3.org/TR/2012/CR-WebIDL-20120419/#es-array
|
| template <class T, class V8T>
|
| -Vector<RefPtr<T> > toRefPtrNativeArrayUnchecked(v8::Local<v8::Value> v8Value, uint32_t length, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| +Vector<RefPtr<T>> toRefPtrNativeArrayUnchecked(v8::Local<v8::Value> v8Value, uint32_t length, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| {
|
| - Vector<RefPtr<T> > result;
|
| + Vector<RefPtr<T>> result;
|
| result.reserveInitialCapacity(length);
|
| v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(v8Value);
|
| v8::TryCatch block;
|
| @@ -530,21 +530,21 @@ Vector<RefPtr<T> > toRefPtrNativeArrayUnchecked(v8::Local<v8::Value> v8Value, ui
|
| v8::Handle<v8::Value> element = object->Get(i);
|
| if (block.HasCaught()) {
|
| exceptionState.rethrowV8Exception(block.Exception());
|
| - return Vector<RefPtr<T> >();
|
| + return Vector<RefPtr<T>>();
|
| }
|
| if (V8T::hasInstance(element, isolate)) {
|
| v8::Handle<v8::Object> elementObject = v8::Handle<v8::Object>::Cast(element);
|
| result.uncheckedAppend(V8T::toImpl(elementObject));
|
| } else {
|
| exceptionState.throwTypeError("Invalid Array element type");
|
| - return Vector<RefPtr<T> >();
|
| + return Vector<RefPtr<T>>();
|
| }
|
| }
|
| return result;
|
| }
|
|
|
| template <class T, class V8T>
|
| -Vector<RefPtr<T> > toRefPtrNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| +Vector<RefPtr<T>> toRefPtrNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| {
|
| v8::Local<v8::Value> v8Value(v8::Local<v8::Value>::New(isolate, value));
|
| uint32_t length = 0;
|
| @@ -553,13 +553,13 @@ Vector<RefPtr<T> > toRefPtrNativeArray(v8::Handle<v8::Value> value, int argument
|
| } else if (!toV8Sequence(value, length, isolate, exceptionState)) {
|
| if (!exceptionState.hadException())
|
| exceptionState.throwTypeError(ExceptionMessages::notAnArrayTypeArgumentOrValue(argumentIndex));
|
| - return Vector<RefPtr<T> >();
|
| + return Vector<RefPtr<T>>();
|
| }
|
| return toRefPtrNativeArrayUnchecked<T, V8T>(v8Value, length, isolate, exceptionState);
|
| }
|
|
|
| template <class T, class V8T>
|
| -Vector<RefPtr<T> > toRefPtrNativeArray(v8::Handle<v8::Value> value, const String& propertyName, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| +Vector<RefPtr<T>> toRefPtrNativeArray(v8::Handle<v8::Value> value, const String& propertyName, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| {
|
| v8::Local<v8::Value> v8Value(v8::Local<v8::Value>::New(isolate, value));
|
| uint32_t length = 0;
|
| @@ -568,13 +568,13 @@ Vector<RefPtr<T> > toRefPtrNativeArray(v8::Handle<v8::Value> value, const String
|
| } else if (!toV8Sequence(value, length, isolate, exceptionState)) {
|
| if (!exceptionState.hadException())
|
| exceptionState.throwTypeError(ExceptionMessages::notASequenceTypeProperty(propertyName));
|
| - return Vector<RefPtr<T> >();
|
| + return Vector<RefPtr<T>>();
|
| }
|
| return toRefPtrNativeArrayUnchecked<T, V8T>(v8Value, length, isolate, exceptionState);
|
| }
|
|
|
| template <class T, class V8T>
|
| -WillBeHeapVector<RefPtrWillBeMember<T> > toRefPtrWillBeMemberNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| +WillBeHeapVector<RefPtrWillBeMember<T>> toRefPtrWillBeMemberNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| {
|
| v8::Local<v8::Value> v8Value(v8::Local<v8::Value>::New(isolate, value));
|
| uint32_t length = 0;
|
| @@ -583,10 +583,10 @@ WillBeHeapVector<RefPtrWillBeMember<T> > toRefPtrWillBeMemberNativeArray(v8::Han
|
| } else if (!toV8Sequence(value, length, isolate, exceptionState)) {
|
| if (!exceptionState.hadException())
|
| exceptionState.throwTypeError(ExceptionMessages::notAnArrayTypeArgumentOrValue(argumentIndex));
|
| - return WillBeHeapVector<RefPtrWillBeMember<T> >();
|
| + return WillBeHeapVector<RefPtrWillBeMember<T>>();
|
| }
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<T> > result;
|
| + WillBeHeapVector<RefPtrWillBeMember<T>> result;
|
| result.reserveInitialCapacity(length);
|
| v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(v8Value);
|
| v8::TryCatch block;
|
| @@ -594,21 +594,21 @@ WillBeHeapVector<RefPtrWillBeMember<T> > toRefPtrWillBeMemberNativeArray(v8::Han
|
| v8::Handle<v8::Value> element = object->Get(i);
|
| if (block.HasCaught()) {
|
| exceptionState.rethrowV8Exception(block.Exception());
|
| - return WillBeHeapVector<RefPtrWillBeMember<T> >();
|
| + return WillBeHeapVector<RefPtrWillBeMember<T>>();
|
| }
|
| if (V8T::hasInstance(element, isolate)) {
|
| v8::Handle<v8::Object> elementObject = v8::Handle<v8::Object>::Cast(element);
|
| result.uncheckedAppend(V8T::toImpl(elementObject));
|
| } else {
|
| exceptionState.throwTypeError("Invalid Array element type");
|
| - return WillBeHeapVector<RefPtrWillBeMember<T> >();
|
| + return WillBeHeapVector<RefPtrWillBeMember<T>>();
|
| }
|
| }
|
| return result;
|
| }
|
|
|
| template <class T, class V8T>
|
| -WillBeHeapVector<RefPtrWillBeMember<T> > toRefPtrWillBeMemberNativeArray(v8::Handle<v8::Value> value, const String& propertyName, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| +WillBeHeapVector<RefPtrWillBeMember<T>> toRefPtrWillBeMemberNativeArray(v8::Handle<v8::Value> value, const String& propertyName, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| {
|
| v8::Local<v8::Value> v8Value(v8::Local<v8::Value>::New(isolate, value));
|
| uint32_t length = 0;
|
| @@ -617,10 +617,10 @@ WillBeHeapVector<RefPtrWillBeMember<T> > toRefPtrWillBeMemberNativeArray(v8::Han
|
| } else if (!toV8Sequence(value, length, isolate, exceptionState)) {
|
| if (!exceptionState.hadException())
|
| exceptionState.throwTypeError(ExceptionMessages::notASequenceTypeProperty(propertyName));
|
| - return WillBeHeapVector<RefPtrWillBeMember<T> >();
|
| + return WillBeHeapVector<RefPtrWillBeMember<T>>();
|
| }
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<T> > result;
|
| + WillBeHeapVector<RefPtrWillBeMember<T>> result;
|
| result.reserveInitialCapacity(length);
|
| v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(v8Value);
|
| v8::TryCatch block;
|
| @@ -628,21 +628,21 @@ WillBeHeapVector<RefPtrWillBeMember<T> > toRefPtrWillBeMemberNativeArray(v8::Han
|
| v8::Handle<v8::Value> element = object->Get(i);
|
| if (block.HasCaught()) {
|
| exceptionState.rethrowV8Exception(block.Exception());
|
| - return WillBeHeapVector<RefPtrWillBeMember<T> >();
|
| + return WillBeHeapVector<RefPtrWillBeMember<T>>();
|
| }
|
| if (V8T::hasInstance(element, isolate)) {
|
| v8::Handle<v8::Object> elementObject = v8::Handle<v8::Object>::Cast(element);
|
| result.uncheckedAppend(V8T::toImpl(elementObject));
|
| } else {
|
| exceptionState.throwTypeError("Invalid Array element type");
|
| - return WillBeHeapVector<RefPtrWillBeMember<T> >();
|
| + return WillBeHeapVector<RefPtrWillBeMember<T>>();
|
| }
|
| }
|
| return result;
|
| }
|
|
|
| template <class T, class V8T>
|
| -HeapVector<Member<T> > toMemberNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| +HeapVector<Member<T>> toMemberNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| {
|
| v8::Local<v8::Value> v8Value(v8::Local<v8::Value>::New(isolate, value));
|
| uint32_t length = 0;
|
| @@ -651,10 +651,10 @@ HeapVector<Member<T> > toMemberNativeArray(v8::Handle<v8::Value> value, int argu
|
| } else if (!toV8Sequence(value, length, isolate, exceptionState)) {
|
| if (!exceptionState.hadException())
|
| exceptionState.throwTypeError(ExceptionMessages::notAnArrayTypeArgumentOrValue(argumentIndex));
|
| - return HeapVector<Member<T> >();
|
| + return HeapVector<Member<T>>();
|
| }
|
|
|
| - HeapVector<Member<T> > result;
|
| + HeapVector<Member<T>> result;
|
| result.reserveInitialCapacity(length);
|
| v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(v8Value);
|
| v8::TryCatch block;
|
| @@ -662,14 +662,14 @@ HeapVector<Member<T> > toMemberNativeArray(v8::Handle<v8::Value> value, int argu
|
| v8::Handle<v8::Value> element = object->Get(i);
|
| if (UNLIKELY(block.HasCaught())) {
|
| exceptionState.rethrowV8Exception(block.Exception());
|
| - return HeapVector<Member<T> >();
|
| + return HeapVector<Member<T>>();
|
| }
|
| if (V8T::hasInstance(element, isolate)) {
|
| v8::Handle<v8::Object> elementObject = v8::Handle<v8::Object>::Cast(element);
|
| result.uncheckedAppend(V8T::toImpl(elementObject));
|
| } else {
|
| exceptionState.throwTypeError("Invalid Array element type");
|
| - return HeapVector<Member<T> >();
|
| + return HeapVector<Member<T>>();
|
| }
|
| }
|
| return result;
|
| @@ -817,7 +817,7 @@ struct NativeValueTraits<double> {
|
| };
|
|
|
| template<>
|
| -struct NativeValueTraits<v8::Local<v8::Value> > {
|
| +struct NativeValueTraits<v8::Local<v8::Value>> {
|
| static inline v8::Local<v8::Value> nativeValue(const v8::Local<v8::Value>& value, v8::Isolate* isolate, ExceptionState&)
|
| {
|
| return value;
|
| @@ -833,7 +833,7 @@ struct NativeValueTraits<ScriptValue> {
|
| };
|
|
|
| template <typename T>
|
| -struct NativeValueTraits<Vector<T> > {
|
| +struct NativeValueTraits<Vector<T>> {
|
| static inline Vector<T> nativeValue(const v8::Local<v8::Value>& value, v8::Isolate* isolate, ExceptionState& exceptionState)
|
| {
|
| return toImplArray<T>(value, 0, isolate, exceptionState);
|
|
|