| Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceGarbageCollected.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceGarbageCollected.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceGarbageCollected.cpp
|
| index 0927058e46de2ad8c6177ce6f98b3afff28ecf3d..270105f9c3b83cd9e48215eb56a94863c3a9854a 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceGarbageCollected.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceGarbageCollected.cpp
|
| @@ -85,10 +85,12 @@ static void attr1AttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Valu
|
| static void funcMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - V8ThrowException::throwException(info.GetIsolate(), createMinimumArityTypeErrorForMethod(info.GetIsolate(), "func", "TestInterfaceGarbageCollected", 1, info.Length()));
|
| + throwMinimumArityErrorForMethod(info.GetIsolate(), "TestInterfaceGarbageCollected", "func", 1, info.Length());
|
| return;
|
| }
|
| +
|
| TestInterfaceGarbageCollected* impl = V8TestInterfaceGarbageCollected::toImpl(info.Holder());
|
| +
|
| TestInterfaceGarbageCollected* arg;
|
| {
|
| arg = V8TestInterfaceGarbageCollected::toImplWithTypeCheck(info.GetIsolate(), info[0]);
|
| @@ -107,8 +109,10 @@ static void funcMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
|
|
| static void keysMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "keys", "TestInterfaceGarbageCollected", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterfaceGarbageCollected", "keys");
|
| +
|
| TestInterfaceGarbageCollected* impl = V8TestInterfaceGarbageCollected::toImpl(info.Holder());
|
| +
|
| ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| Iterator* result = impl->keysForBinding(scriptState, exceptionState);
|
| if (exceptionState.hadException()) {
|
| @@ -124,8 +128,10 @@ static void keysMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
|
|
| static void valuesMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "values", "TestInterfaceGarbageCollected", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterfaceGarbageCollected", "values");
|
| +
|
| TestInterfaceGarbageCollected* impl = V8TestInterfaceGarbageCollected::toImpl(info.Holder());
|
| +
|
| ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| Iterator* result = impl->valuesForBinding(scriptState, exceptionState);
|
| if (exceptionState.hadException()) {
|
| @@ -141,8 +147,10 @@ static void valuesMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info
|
|
|
| static void entriesMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "entries", "TestInterfaceGarbageCollected", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterfaceGarbageCollected", "entries");
|
| +
|
| TestInterfaceGarbageCollected* impl = V8TestInterfaceGarbageCollected::toImpl(info.Holder());
|
| +
|
| ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| Iterator* result = impl->entriesForBinding(scriptState, exceptionState);
|
| if (exceptionState.hadException()) {
|
| @@ -158,12 +166,16 @@ static void entriesMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& inf
|
|
|
| static void forEachMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "forEach", "TestInterfaceGarbageCollected", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterfaceGarbageCollected", "forEach");
|
| +
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| + throwMinimumArityError(exceptionState, 1, info.Length());
|
| return;
|
| }
|
| +
|
| TestInterfaceGarbageCollected* impl = V8TestInterfaceGarbageCollected::toImpl(info.Holder());
|
| +
|
| + ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| ScriptValue callback;
|
| ScriptValue thisArg;
|
| {
|
| @@ -174,7 +186,6 @@ static void forEachMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| callback = ScriptValue(ScriptState::current(info.GetIsolate()), info[0]);
|
| thisArg = ScriptValue(ScriptState::current(info.GetIsolate()), info[1]);
|
| }
|
| - ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| impl->forEachForBinding(scriptState, ScriptValue(scriptState, info.Holder()), callback, thisArg, exceptionState);
|
| if (exceptionState.hadException()) {
|
| return;
|
| @@ -188,19 +199,22 @@ static void forEachMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& inf
|
|
|
| static void hasMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "has", "TestInterfaceGarbageCollected", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterfaceGarbageCollected", "has");
|
| +
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| + throwMinimumArityError(exceptionState, 1, info.Length());
|
| return;
|
| }
|
| +
|
| TestInterfaceGarbageCollected* impl = V8TestInterfaceGarbageCollected::toImpl(info.Holder());
|
| +
|
| + ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| V8StringResource<> value;
|
| {
|
| value = info[0];
|
| if (!value.prepare())
|
| return;
|
| }
|
| - ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| bool result = impl->hasForBinding(scriptState, value, exceptionState);
|
| if (exceptionState.hadException()) {
|
| return;
|
| @@ -215,19 +229,22 @@ static void hasMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
|
|
| static void addMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "add", "TestInterfaceGarbageCollected", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterfaceGarbageCollected", "add");
|
| +
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| + throwMinimumArityError(exceptionState, 1, info.Length());
|
| return;
|
| }
|
| +
|
| TestInterfaceGarbageCollected* impl = V8TestInterfaceGarbageCollected::toImpl(info.Holder());
|
| +
|
| + ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| V8StringResource<> value;
|
| {
|
| value = info[0];
|
| if (!value.prepare())
|
| return;
|
| }
|
| - ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| TestInterfaceGarbageCollected* result = impl->addForBinding(scriptState, value, exceptionState);
|
| if (exceptionState.hadException()) {
|
| return;
|
| @@ -242,8 +259,10 @@ static void addMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
|
|
| static void clearMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "clear", "TestInterfaceGarbageCollected", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterfaceGarbageCollected", "clear");
|
| +
|
| TestInterfaceGarbageCollected* impl = V8TestInterfaceGarbageCollected::toImpl(info.Holder());
|
| +
|
| ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| impl->clearForBinding(scriptState, exceptionState);
|
| if (exceptionState.hadException()) {
|
| @@ -258,19 +277,22 @@ static void clearMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
|
|
| static void deleteMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "delete", "TestInterfaceGarbageCollected", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterfaceGarbageCollected", "delete");
|
| +
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| + throwMinimumArityError(exceptionState, 1, info.Length());
|
| return;
|
| }
|
| +
|
| TestInterfaceGarbageCollected* impl = V8TestInterfaceGarbageCollected::toImpl(info.Holder());
|
| +
|
| + ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| V8StringResource<> value;
|
| {
|
| value = info[0];
|
| if (!value.prepare())
|
| return;
|
| }
|
| - ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| bool result = impl->deleteForBinding(scriptState, value, exceptionState);
|
| if (exceptionState.hadException()) {
|
| return;
|
| @@ -285,8 +307,10 @@ static void deleteMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info
|
|
|
| static void iteratorMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "iterator", "TestInterfaceGarbageCollected", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterfaceGarbageCollected", "iterator");
|
| +
|
| TestInterfaceGarbageCollected* impl = V8TestInterfaceGarbageCollected::toImpl(info.Holder());
|
| +
|
| ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| Iterator* result = impl->iterator(scriptState, exceptionState);
|
| if (exceptionState.hadException()) {
|
| @@ -303,7 +327,7 @@ static void iteratorMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& in
|
| static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - V8ThrowException::throwException(info.GetIsolate(), createMinimumArityTypeErrorForConstructor(info.GetIsolate(), "TestInterfaceGarbageCollected", 1, info.Length()));
|
| + throwMinimumArityErrorForConstructor(info.GetIsolate(), "TestInterfaceGarbageCollected", 1, info.Length());
|
| return;
|
| }
|
| V8StringResource<> str;
|
|
|