| Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp
|
| index b27c285be8c4b8ccbc0c343cfbdf41e40aac2e98..6d556681cf118a0639a153be9a2a014ac2a8ad46 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp
|
| @@ -51,223 +51,212 @@ static_assert(
|
|
|
| namespace TestInterfaceConstructor2V8Internal {
|
|
|
| -static void constructor1(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| -{
|
| - V8StringResource<> stringArg;
|
| - stringArg = info[0];
|
| - if (!stringArg.prepare())
|
| - return;
|
| -
|
| - TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(stringArg);
|
| - v8::Local<v8::Object> wrapper = info.Holder();
|
| - wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
|
| - v8SetReturnValue(info, wrapper);
|
| +static void constructor1(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + V8StringResource<> stringArg;
|
| + stringArg = info[0];
|
| + if (!stringArg.prepare())
|
| + return;
|
| +
|
| + TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(stringArg);
|
| + v8::Local<v8::Object> wrapper = info.Holder();
|
| + wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
|
| + v8SetReturnValue(info, wrapper);
|
| }
|
|
|
| -static void constructor2(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| -{
|
| - ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
|
| +static void constructor2(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
|
|
|
| - Dictionary dictionaryArg;
|
| - if (!isUndefinedOrNull(info[0]) && !info[0]->IsObject()) {
|
| - exceptionState.throwTypeError("parameter 1 ('dictionaryArg') is not an object.");
|
| + Dictionary dictionaryArg;
|
| + if (!isUndefinedOrNull(info[0]) && !info[0]->IsObject()) {
|
| + exceptionState.throwTypeError("parameter 1 ('dictionaryArg') is not an object.");
|
|
|
| - return;
|
| - }
|
| - dictionaryArg = Dictionary(info[0], info.GetIsolate(), exceptionState);
|
| - if (exceptionState.hadException())
|
| - return;
|
| + return;
|
| + }
|
| + dictionaryArg = Dictionary(info[0], info.GetIsolate(), exceptionState);
|
| + if (exceptionState.hadException())
|
| + return;
|
|
|
| - TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(dictionaryArg);
|
| - v8::Local<v8::Object> wrapper = info.Holder();
|
| - wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
|
| - v8SetReturnValue(info, wrapper);
|
| + TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(dictionaryArg);
|
| + v8::Local<v8::Object> wrapper = info.Holder();
|
| + wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
|
| + v8SetReturnValue(info, wrapper);
|
| }
|
|
|
| -static void constructor3(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| -{
|
| - ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
|
| +static void constructor3(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
|
|
|
| - Vector<Vector<String>> stringSequenceSequenceArg;
|
| - stringSequenceSequenceArg = toImplArray<Vector<Vector<String>>>(info[0], 1, info.GetIsolate(), exceptionState);
|
| - if (exceptionState.hadException())
|
| - return;
|
| + Vector<Vector<String>> stringSequenceSequenceArg;
|
| + stringSequenceSequenceArg = toImplArray<Vector<Vector<String>>>(info[0], 1, info.GetIsolate(), exceptionState);
|
| + if (exceptionState.hadException())
|
| + return;
|
|
|
| - TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(stringSequenceSequenceArg);
|
| - v8::Local<v8::Object> wrapper = info.Holder();
|
| - wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
|
| - v8SetReturnValue(info, wrapper);
|
| + TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(stringSequenceSequenceArg);
|
| + v8::Local<v8::Object> wrapper = info.Holder();
|
| + wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
|
| + v8SetReturnValue(info, wrapper);
|
| }
|
|
|
| -static void constructor4(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| -{
|
| - ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
|
| -
|
| - TestInterfaceEmpty* testInterfaceEmptyArg;
|
| - int longArg;
|
| - V8StringResource<> defaultUndefinedOptionalStringArg;
|
| - V8StringResource<> defaultNullStringOptionalStringArg;
|
| - Dictionary defaultUndefinedOptionalDictionaryArg;
|
| - V8StringResource<> optionalStringArg;
|
| - int numArgsPassed = info.Length();
|
| - while (numArgsPassed > 0) {
|
| - if (!info[numArgsPassed - 1]->IsUndefined())
|
| - break;
|
| - --numArgsPassed;
|
| - }
|
| - testInterfaceEmptyArg = V8TestInterfaceEmpty::toImplWithTypeCheck(info.GetIsolate(), info[0]);
|
| - if (!testInterfaceEmptyArg) {
|
| - exceptionState.throwTypeError("parameter 1 is not of type 'TestInterfaceEmpty'.");
|
| -
|
| - return;
|
| - }
|
| -
|
| - longArg = toInt32(info.GetIsolate(), info[1], NormalConversion, exceptionState);
|
| - if (exceptionState.hadException())
|
| - return;
|
| -
|
| - defaultUndefinedOptionalStringArg = info[2];
|
| - if (!defaultUndefinedOptionalStringArg.prepare())
|
| - return;
|
| -
|
| - if (!info[3]->IsUndefined()) {
|
| - defaultNullStringOptionalStringArg = info[3];
|
| - if (!defaultNullStringOptionalStringArg.prepare())
|
| - return;
|
| - } else {
|
| - defaultNullStringOptionalStringArg = nullptr;
|
| - }
|
| - if (!isUndefinedOrNull(info[4]) && !info[4]->IsObject()) {
|
| - exceptionState.throwTypeError("parameter 5 ('defaultUndefinedOptionalDictionaryArg') is not an object.");
|
| -
|
| - return;
|
| - }
|
| - defaultUndefinedOptionalDictionaryArg = Dictionary(info[4], info.GetIsolate(), exceptionState);
|
| - if (exceptionState.hadException())
|
| - return;
|
| -
|
| - if (UNLIKELY(numArgsPassed <= 5)) {
|
| - TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(testInterfaceEmptyArg, longArg, defaultUndefinedOptionalStringArg, defaultNullStringOptionalStringArg, defaultUndefinedOptionalDictionaryArg);
|
| - v8::Local<v8::Object> wrapper = info.Holder();
|
| - wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
|
| - v8SetReturnValue(info, wrapper);
|
| - return;
|
| - }
|
| - optionalStringArg = info[5];
|
| - if (!optionalStringArg.prepare())
|
| - return;
|
| -
|
| - TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(testInterfaceEmptyArg, longArg, defaultUndefinedOptionalStringArg, defaultNullStringOptionalStringArg, defaultUndefinedOptionalDictionaryArg, optionalStringArg);
|
| +static void constructor4(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
|
| +
|
| + TestInterfaceEmpty* testInterfaceEmptyArg;
|
| + int longArg;
|
| + V8StringResource<> defaultUndefinedOptionalStringArg;
|
| + V8StringResource<> defaultNullStringOptionalStringArg;
|
| + Dictionary defaultUndefinedOptionalDictionaryArg;
|
| + V8StringResource<> optionalStringArg;
|
| + int numArgsPassed = info.Length();
|
| + while (numArgsPassed > 0) {
|
| + if (!info[numArgsPassed - 1]->IsUndefined())
|
| + break;
|
| + --numArgsPassed;
|
| + }
|
| + testInterfaceEmptyArg = V8TestInterfaceEmpty::toImplWithTypeCheck(info.GetIsolate(), info[0]);
|
| + if (!testInterfaceEmptyArg) {
|
| + exceptionState.throwTypeError("parameter 1 is not of type 'TestInterfaceEmpty'.");
|
| +
|
| + return;
|
| + }
|
| +
|
| + longArg = toInt32(info.GetIsolate(), info[1], NormalConversion, exceptionState);
|
| + if (exceptionState.hadException())
|
| + return;
|
| +
|
| + defaultUndefinedOptionalStringArg = info[2];
|
| + if (!defaultUndefinedOptionalStringArg.prepare())
|
| + return;
|
| +
|
| + if (!info[3]->IsUndefined()) {
|
| + defaultNullStringOptionalStringArg = info[3];
|
| + if (!defaultNullStringOptionalStringArg.prepare())
|
| + return;
|
| + } else {
|
| + defaultNullStringOptionalStringArg = nullptr;
|
| + }
|
| + if (!isUndefinedOrNull(info[4]) && !info[4]->IsObject()) {
|
| + exceptionState.throwTypeError("parameter 5 ('defaultUndefinedOptionalDictionaryArg') is not an object.");
|
| +
|
| + return;
|
| + }
|
| + defaultUndefinedOptionalDictionaryArg = Dictionary(info[4], info.GetIsolate(), exceptionState);
|
| + if (exceptionState.hadException())
|
| + return;
|
| +
|
| + if (UNLIKELY(numArgsPassed <= 5)) {
|
| + TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(testInterfaceEmptyArg, longArg, defaultUndefinedOptionalStringArg, defaultNullStringOptionalStringArg, defaultUndefinedOptionalDictionaryArg);
|
| v8::Local<v8::Object> wrapper = info.Holder();
|
| wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
|
| v8SetReturnValue(info, wrapper);
|
| + return;
|
| + }
|
| + optionalStringArg = info[5];
|
| + if (!optionalStringArg.prepare())
|
| + return;
|
| +
|
| + TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(testInterfaceEmptyArg, longArg, defaultUndefinedOptionalStringArg, defaultNullStringOptionalStringArg, defaultUndefinedOptionalDictionaryArg, optionalStringArg);
|
| + v8::Local<v8::Object> wrapper = info.Holder();
|
| + wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
|
| + v8SetReturnValue(info, wrapper);
|
| }
|
|
|
| -static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| -{
|
| - ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
|
| - switch (std::min(6, info.Length())) {
|
| +static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
|
| + switch (std::min(6, info.Length())) {
|
| case 1:
|
| - if (info[0]->IsArray()) {
|
| - TestInterfaceConstructor2V8Internal::constructor3(info);
|
| - return;
|
| - }
|
| - if (info[0]->IsObject()) {
|
| - TestInterfaceConstructor2V8Internal::constructor2(info);
|
| - return;
|
| - }
|
| - if (true) {
|
| - TestInterfaceConstructor2V8Internal::constructor1(info);
|
| - return;
|
| - }
|
| - break;
|
| + if (info[0]->IsArray()) {
|
| + TestInterfaceConstructor2V8Internal::constructor3(info);
|
| + return;
|
| + }
|
| + if (info[0]->IsObject()) {
|
| + TestInterfaceConstructor2V8Internal::constructor2(info);
|
| + return;
|
| + }
|
| + if (true) {
|
| + TestInterfaceConstructor2V8Internal::constructor1(info);
|
| + return;
|
| + }
|
| + break;
|
| case 2:
|
| - if (true) {
|
| - TestInterfaceConstructor2V8Internal::constructor4(info);
|
| - return;
|
| - }
|
| - break;
|
| + if (true) {
|
| + TestInterfaceConstructor2V8Internal::constructor4(info);
|
| + return;
|
| + }
|
| + break;
|
| case 3:
|
| - if (true) {
|
| - TestInterfaceConstructor2V8Internal::constructor4(info);
|
| - return;
|
| - }
|
| - break;
|
| + if (true) {
|
| + TestInterfaceConstructor2V8Internal::constructor4(info);
|
| + return;
|
| + }
|
| + break;
|
| case 4:
|
| - if (true) {
|
| - TestInterfaceConstructor2V8Internal::constructor4(info);
|
| - return;
|
| - }
|
| - break;
|
| + if (true) {
|
| + TestInterfaceConstructor2V8Internal::constructor4(info);
|
| + return;
|
| + }
|
| + break;
|
| case 5:
|
| - if (true) {
|
| - TestInterfaceConstructor2V8Internal::constructor4(info);
|
| - return;
|
| - }
|
| - break;
|
| + if (true) {
|
| + TestInterfaceConstructor2V8Internal::constructor4(info);
|
| + return;
|
| + }
|
| + break;
|
| case 6:
|
| - if (true) {
|
| - TestInterfaceConstructor2V8Internal::constructor4(info);
|
| - return;
|
| - }
|
| - break;
|
| - default:
|
| - exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(1, info.Length()));
|
| + if (true) {
|
| + TestInterfaceConstructor2V8Internal::constructor4(info);
|
| return;
|
| - }
|
| - exceptionState.throwTypeError("No matching constructor signature.");
|
| + }
|
| + break;
|
| + default:
|
| + exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(1, info.Length()));
|
| + return;
|
| + }
|
| + exceptionState.throwTypeError("No matching constructor signature.");
|
| }
|
|
|
| } // namespace TestInterfaceConstructor2V8Internal
|
|
|
| -void V8TestInterfaceConstructor2::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| -{
|
| - if (!info.IsConstructCall()) {
|
| - V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::constructorNotCallableAsFunction("TestInterfaceConstructor2"));
|
| - return;
|
| - }
|
| +void V8TestInterfaceConstructor2::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + if (!info.IsConstructCall()) {
|
| + V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::constructorNotCallableAsFunction("TestInterfaceConstructor2"));
|
| + return;
|
| + }
|
|
|
| - if (ConstructorMode::current(info.GetIsolate()) == ConstructorMode::WrapExistingObject) {
|
| - v8SetReturnValue(info, info.Holder());
|
| - return;
|
| - }
|
| + if (ConstructorMode::current(info.GetIsolate()) == ConstructorMode::WrapExistingObject) {
|
| + v8SetReturnValue(info, info.Holder());
|
| + return;
|
| + }
|
|
|
| - TestInterfaceConstructor2V8Internal::constructor(info);
|
| + TestInterfaceConstructor2V8Internal::constructor(info);
|
| }
|
|
|
| -static void installV8TestInterfaceConstructor2Template(v8::Isolate* isolate, const DOMWrapperWorld& world, v8::Local<v8::FunctionTemplate> interfaceTemplate)
|
| -{
|
| - // Initialize the interface object's template.
|
| - V8DOMConfiguration::initializeDOMInterfaceTemplate(isolate, interfaceTemplate, V8TestInterfaceConstructor2::wrapperTypeInfo.interfaceName, v8::Local<v8::FunctionTemplate>(), V8TestInterfaceConstructor2::internalFieldCount);
|
| - interfaceTemplate->SetCallHandler(V8TestInterfaceConstructor2::constructorCallback);
|
| - interfaceTemplate->SetLength(1);
|
| - v8::Local<v8::Signature> signature = v8::Signature::New(isolate, interfaceTemplate);
|
| - ALLOW_UNUSED_LOCAL(signature);
|
| - v8::Local<v8::ObjectTemplate> instanceTemplate = interfaceTemplate->InstanceTemplate();
|
| - ALLOW_UNUSED_LOCAL(instanceTemplate);
|
| - v8::Local<v8::ObjectTemplate> prototypeTemplate = interfaceTemplate->PrototypeTemplate();
|
| - ALLOW_UNUSED_LOCAL(prototypeTemplate);
|
| - // Register DOM constants, attributes and operations.
|
| +static void installV8TestInterfaceConstructor2Template(v8::Isolate* isolate, const DOMWrapperWorld& world, v8::Local<v8::FunctionTemplate> interfaceTemplate) {
|
| + // Initialize the interface object's template.
|
| + V8DOMConfiguration::initializeDOMInterfaceTemplate(isolate, interfaceTemplate, V8TestInterfaceConstructor2::wrapperTypeInfo.interfaceName, v8::Local<v8::FunctionTemplate>(), V8TestInterfaceConstructor2::internalFieldCount);
|
| + interfaceTemplate->SetCallHandler(V8TestInterfaceConstructor2::constructorCallback);
|
| + interfaceTemplate->SetLength(1);
|
| + v8::Local<v8::Signature> signature = v8::Signature::New(isolate, interfaceTemplate);
|
| + ALLOW_UNUSED_LOCAL(signature);
|
| + v8::Local<v8::ObjectTemplate> instanceTemplate = interfaceTemplate->InstanceTemplate();
|
| + ALLOW_UNUSED_LOCAL(instanceTemplate);
|
| + v8::Local<v8::ObjectTemplate> prototypeTemplate = interfaceTemplate->PrototypeTemplate();
|
| + ALLOW_UNUSED_LOCAL(prototypeTemplate);
|
| + // Register DOM constants, attributes and operations.
|
| }
|
|
|
| -v8::Local<v8::FunctionTemplate> V8TestInterfaceConstructor2::domTemplate(v8::Isolate* isolate, const DOMWrapperWorld& world)
|
| -{
|
| - return V8DOMConfiguration::domClassTemplate(isolate, world, const_cast<WrapperTypeInfo*>(&wrapperTypeInfo), installV8TestInterfaceConstructor2Template);
|
| +v8::Local<v8::FunctionTemplate> V8TestInterfaceConstructor2::domTemplate(v8::Isolate* isolate, const DOMWrapperWorld& world) {
|
| + return V8DOMConfiguration::domClassTemplate(isolate, world, const_cast<WrapperTypeInfo*>(&wrapperTypeInfo), installV8TestInterfaceConstructor2Template);
|
| }
|
|
|
| -bool V8TestInterfaceConstructor2::hasInstance(v8::Local<v8::Value> v8Value, v8::Isolate* isolate)
|
| -{
|
| - return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, v8Value);
|
| +bool V8TestInterfaceConstructor2::hasInstance(v8::Local<v8::Value> v8Value, v8::Isolate* isolate) {
|
| + return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, v8Value);
|
| }
|
|
|
| -v8::Local<v8::Object> V8TestInterfaceConstructor2::findInstanceInPrototypeChain(v8::Local<v8::Value> v8Value, v8::Isolate* isolate)
|
| -{
|
| - return V8PerIsolateData::from(isolate)->findInstanceInPrototypeChain(&wrapperTypeInfo, v8Value);
|
| +v8::Local<v8::Object> V8TestInterfaceConstructor2::findInstanceInPrototypeChain(v8::Local<v8::Value> v8Value, v8::Isolate* isolate) {
|
| + return V8PerIsolateData::from(isolate)->findInstanceInPrototypeChain(&wrapperTypeInfo, v8Value);
|
| }
|
|
|
| -TestInterfaceConstructor2* V8TestInterfaceConstructor2::toImplWithTypeCheck(v8::Isolate* isolate, v8::Local<v8::Value> value)
|
| -{
|
| - return hasInstance(value, isolate) ? toImpl(v8::Local<v8::Object>::Cast(value)) : nullptr;
|
| +TestInterfaceConstructor2* V8TestInterfaceConstructor2::toImplWithTypeCheck(v8::Isolate* isolate, v8::Local<v8::Value> value) {
|
| + return hasInstance(value, isolate) ? toImpl(v8::Local<v8::Object>::Cast(value)) : nullptr;
|
| }
|
|
|
| -} // namespace blink
|
| +} // namespace blink
|
|
|