third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp - Issue 2810843002: bindings: Make the sequence conversion code more complaint with WebIDL.

Unified Diff: third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp

Issue 2810843002: bindings: Make the sequence conversion code more complaint with WebIDL. (Closed)

Patch Set: Adjust even more tests Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp ('k') | third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp

diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp

index a4478c03bf05a9e47b340c0bd51d3c92cf4f6e8a..f9c53e0b8521523dfd02bcd4a628dfa3d74ba6a8 100644

--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp

+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp

@@ -1223,7 +1223,7 @@ static void stringArrayAttributeAttributeSetter(v8::Local<v8::Value> v8Value, co

ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "stringArrayAttribute");

// Prepare the value to be set.

- Vector<String> cppValue = ToImplArray<Vector<String>>(v8Value, 0, info.GetIsolate(), exceptionState);

+ Vector<String> cppValue = NativeValueTraits<IDLSequence<IDLString>>::NativeValue(info.GetIsolate(), v8Value, exceptionState);

if (exceptionState.HadException())

return;

@@ -1248,7 +1248,7 @@ static void testInterfaceEmptyArrayAttributeAttributeSetter(v8::Local<v8::Value>

ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "testInterfaceEmptyArrayAttribute");

// Prepare the value to be set.

- HeapVector<Member<TestInterfaceEmpty>> cppValue = ToMemberNativeArray<TestInterfaceEmpty>(v8Value, 0, info.GetIsolate(), exceptionState);

+ HeapVector<Member<TestInterfaceEmpty>> cppValue = NativeValueTraits<IDLSequence<TestInterfaceEmpty>>::NativeValue(info.GetIsolate(), v8Value, exceptionState);

if (exceptionState.HadException())

return;

@@ -1273,7 +1273,7 @@ static void floatArrayAttributeAttributeSetter(v8::Local<v8::Value> v8Value, con

ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "floatArrayAttribute");

// Prepare the value to be set.

- Vector<float> cppValue = ToImplArray<Vector<float>, IDLFloat>(v8Value, 0, info.GetIsolate(), exceptionState);

+ Vector<float> cppValue = NativeValueTraits<IDLSequence<IDLFloat>>::NativeValue(info.GetIsolate(), v8Value, exceptionState);

if (exceptionState.HadException())

return;

@@ -1298,7 +1298,7 @@ static void stringFrozenArrayAttributeAttributeSetter(v8::Local<v8::Value> v8Val

ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "stringFrozenArrayAttribute");

// Prepare the value to be set.

- Vector<String> cppValue = ToImplArray<Vector<String>>(v8Value, 0, info.GetIsolate(), exceptionState);

+ Vector<String> cppValue = NativeValueTraits<IDLSequence<IDLString>>::NativeValue(info.GetIsolate(), v8Value, exceptionState);

if (exceptionState.HadException())

return;

@@ -1323,7 +1323,7 @@ static void testInterfaceEmptyFrozenArrayAttributeAttributeSetter(v8::Local<v8::

ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "testInterfaceEmptyFrozenArrayAttribute");

// Prepare the value to be set.

- HeapVector<Member<TestInterfaceEmpty>> cppValue = ToMemberNativeArray<TestInterfaceEmpty>(v8Value, 0, info.GetIsolate(), exceptionState);

+ HeapVector<Member<TestInterfaceEmpty>> cppValue = NativeValueTraits<IDLSequence<TestInterfaceEmpty>>::NativeValue(info.GetIsolate(), v8Value, exceptionState);

if (exceptionState.HadException())

return;

@@ -1946,7 +1946,7 @@ static void cachedArrayAttributeAttributeSetter(v8::Local<v8::Value> v8Value, co

ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "cachedArrayAttribute");

// Prepare the value to be set.

- Vector<String> cppValue = ToImplArray<Vector<String>>(v8Value, 0, info.GetIsolate(), exceptionState);

+ Vector<String> cppValue = NativeValueTraits<IDLSequence<IDLString>>::NativeValue(info.GetIsolate(), v8Value, exceptionState);

if (exceptionState.HadException())

return;

@@ -4899,7 +4899,7 @@ static void voidMethodArrayLongArgMethod(const v8::FunctionCallbackInfo<v8::Valu

}

Vector<int32_t> arrayLongArg;

- arrayLongArg = ToImplArray<Vector<int32_t>, IDLLong>(info[0], 1, info.GetIsolate(), exceptionState);

+ arrayLongArg = NativeValueTraits<IDLSequence<IDLLong>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -4917,7 +4917,7 @@ static void voidMethodArrayStringArgMethod(const v8::FunctionCallbackInfo<v8::Va

}

Vector<String> arrayStringArg;

- arrayStringArg = ToImplArray<Vector<String>>(info[0], 1, info.GetIsolate(), exceptionState);

+ arrayStringArg = NativeValueTraits<IDLSequence<IDLString>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -4935,7 +4935,7 @@ static void voidMethodArrayTestInterfaceEmptyArgMethod(const v8::FunctionCallbac

}

HeapVector<Member<TestInterfaceEmpty>> arrayTestInterfaceEmptyArg;

- arrayTestInterfaceEmptyArg = ToMemberNativeArray<TestInterfaceEmpty>(info[0], 1, info.GetIsolate(), exceptionState);

+ arrayTestInterfaceEmptyArg = NativeValueTraits<IDLSequence<TestInterfaceEmpty>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -4954,7 +4954,7 @@ static void voidMethodNullableArrayLongArgMethod(const v8::FunctionCallbackInfo<

Nullable<Vector<int32_t>> arrayLongArg;

if (!IsUndefinedOrNull(info[0])) {

- arrayLongArg = ToImplArray<Vector<int32_t>, IDLLong>(info[0], 1, info.GetIsolate(), exceptionState);

+ arrayLongArg = NativeValueTraits<IDLSequence<IDLLong>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

}

@@ -4991,7 +4991,7 @@ static void voidMethodSequenceLongArgMethod(const v8::FunctionCallbackInfo<v8::V

}

Vector<int32_t> longSequenceArg;

- longSequenceArg = ToImplArray<Vector<int32_t>, IDLLong>(info[0], 1, info.GetIsolate(), exceptionState);

+ longSequenceArg = NativeValueTraits<IDLSequence<IDLLong>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -5009,7 +5009,7 @@ static void voidMethodSequenceStringArgMethod(const v8::FunctionCallbackInfo<v8:

}

Vector<String> stringSequenceArg;

- stringSequenceArg = ToImplArray<Vector<String>>(info[0], 1, info.GetIsolate(), exceptionState);

+ stringSequenceArg = NativeValueTraits<IDLSequence<IDLString>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -5027,7 +5027,7 @@ static void voidMethodSequenceTestInterfaceEmptyArgMethod(const v8::FunctionCall

}

HeapVector<Member<TestInterfaceEmpty>> testInterfaceEmptySequenceArg;

- testInterfaceEmptySequenceArg = ToMemberNativeArray<TestInterfaceEmpty>(info[0], 1, info.GetIsolate(), exceptionState);

+ testInterfaceEmptySequenceArg = NativeValueTraits<IDLSequence<TestInterfaceEmpty>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -5045,7 +5045,7 @@ static void voidMethodSequenceSequenceDOMStringArgMethod(const v8::FunctionCallb

}

Vector<Vector<String>> stringSequenceSequenceArg;

- stringSequenceSequenceArg = ToImplArray<Vector<Vector<String>>>(info[0], 1, info.GetIsolate(), exceptionState);

+ stringSequenceSequenceArg = NativeValueTraits<IDLSequence<IDLSequence<IDLString>>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -5064,7 +5064,7 @@ static void voidMethodNullableSequenceLongArgMethod(const v8::FunctionCallbackIn

Nullable<Vector<int32_t>> longSequenceArg;

if (!IsUndefinedOrNull(info[0])) {

- longSequenceArg = ToImplArray<Vector<int32_t>, IDLLong>(info[0], 1, info.GetIsolate(), exceptionState);

+ longSequenceArg = NativeValueTraits<IDLSequence<IDLLong>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

}

@@ -5089,7 +5089,7 @@ static void voidMethodStringFrozenArrayMethodMethod(const v8::FunctionCallbackIn

}

Vector<String> stringFrozenArrayArg;

- stringFrozenArrayArg = ToImplArray<Vector<String>>(info[0], 1, info.GetIsolate(), exceptionState);

+ stringFrozenArrayArg = NativeValueTraits<IDLSequence<IDLString>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -5107,7 +5107,7 @@ static void voidMethodTestInterfaceEmptyFrozenArrayMethodMethod(const v8::Functi

}

HeapVector<Member<TestInterfaceEmpty>> testInterfaceEmptyFrozenArrayArg;

- testInterfaceEmptyFrozenArrayArg = ToMemberNativeArray<TestInterfaceEmpty>(info[0], 1, info.GetIsolate(), exceptionState);

+ testInterfaceEmptyFrozenArrayArg = NativeValueTraits<IDLSequence<TestInterfaceEmpty>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -5732,7 +5732,7 @@ static void voidMethodDictionarySequenceArgMethod(const v8::FunctionCallbackInfo

}

Vector<Dictionary> dictionarySequenceArg;

- dictionarySequenceArg = ToImplArray<Vector<Dictionary>>(info[0], 1, info.GetIsolate(), exceptionState);

+ dictionarySequenceArg = NativeValueTraits<IDLSequence<Dictionary>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -6270,7 +6270,7 @@ static void voidMethodDefaultStringSequenceArgMethod(const v8::FunctionCallbackI

Vector<String> defaultStringSequenceArg;

if (!info[0]->IsUndefined()) {

- defaultStringSequenceArg = ToImplArray<Vector<String>>(info[0], 1, info.GetIsolate(), exceptionState);

+ defaultStringSequenceArg = NativeValueTraits<IDLSequence<IDLString>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

} else {

@@ -6597,7 +6597,7 @@ static void overloadedMethodD2Method(const v8::FunctionCallbackInfo<v8::Value>&

TestObject* impl = V8TestObject::toImpl(info.Holder());

Vector<int32_t> longArrayArg;

- longArrayArg = ToImplArray<Vector<int32_t>, IDLLong>(info[0], 1, info.GetIsolate(), exceptionState);

+ longArrayArg = NativeValueTraits<IDLSequence<IDLLong>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -8790,7 +8790,7 @@ static void voidMethodTestInterfaceGarbageCollectedSequenceArgMethod(const v8::F

}

HeapVector<Member<TestInterfaceGarbageCollected>> testInterfaceGarbageCollectedSequenceArg;

- testInterfaceGarbageCollectedSequenceArg = ToMemberNativeArray<TestInterfaceGarbageCollected>(info[0], 1, info.GetIsolate(), exceptionState);

+ testInterfaceGarbageCollectedSequenceArg = NativeValueTraits<IDLSequence<TestInterfaceGarbageCollected>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;

@@ -8808,7 +8808,7 @@ static void voidMethodTestInterfaceGarbageCollectedArrayArgMethod(const v8::Func

}

HeapVector<Member<TestInterfaceGarbageCollected>> testInterfaceGarbageCollectedArrayArg;

- testInterfaceGarbageCollectedArrayArg = ToMemberNativeArray<TestInterfaceGarbageCollected>(info[0], 1, info.GetIsolate(), exceptionState);

+ testInterfaceGarbageCollectedArrayArg = NativeValueTraits<IDLSequence<TestInterfaceGarbageCollected>>::NativeValue(info.GetIsolate(), info[0], exceptionState);

if (exceptionState.HadException())

return;