| Index: Source/bindings/tests/results/V8TestInterface.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestInterface.cpp b/Source/bindings/tests/results/V8TestInterface.cpp
|
| index 58b5b59a2c77086fb5247b8ccd5b231c399a8c67..85b0e61b4fb39108385ad7c680da26f2fb370a59 100644
|
| --- a/Source/bindings/tests/results/V8TestInterface.cpp
|
| +++ b/Source/bindings/tests/results/V8TestInterface.cpp
|
| @@ -437,23 +437,27 @@ static v8::Handle<v8::Value> supplementalMethod4MethodCallback(const v8::Argumen
|
|
|
| #endif // ENABLE(Condition11) || ENABLE(Condition12)
|
|
|
| -static v8::Handle<v8::Value> constructor(const v8::Arguments& args)
|
| +static void constructor(const v8::FunctionCallbackInfo<v8::Value>& args)
|
| {
|
| - if (args.Length() < 1)
|
| - return throwNotEnoughArgumentsError(args.GetIsolate());
|
| + if (args.Length() < 1) {
|
| + throwNotEnoughArgumentsError(args.GetIsolate());
|
| + return;
|
| + }
|
| ExceptionCode ec = 0;
|
| - V8TRYCATCH_FOR_V8STRINGRESOURCE(V8StringResource<>, str1, args[0]);
|
| - V8TRYCATCH_FOR_V8STRINGRESOURCE(V8StringResource<>, str2, args[1]);
|
| + V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, str1, args[0]);
|
| + V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, str2, args[1]);
|
|
|
| ScriptExecutionContext* context = getScriptExecutionContext();
|
|
|
| RefPtr<TestInterface> impl = TestInterface::create(context, str1, str2, ec);
|
| v8::Handle<v8::Object> wrapper = args.Holder();
|
| - if (ec)
|
| - return setDOMException(ec, args.GetIsolate());
|
| + if (ec) {
|
| + setDOMException(ec, args.GetIsolate());
|
| + return;
|
| + }
|
|
|
| V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestInterface::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
|
| - return wrapper;
|
| + args.GetReturnValue().Set(wrapper);
|
| }
|
|
|
| } // namespace TestInterfaceV8Internal
|
| @@ -511,15 +515,19 @@ COMPILE_ASSERT(1 == TestPartialInterface::SUPPLEMENTALCONSTANT1, TestInterfaceEn
|
| COMPILE_ASSERT(2 == TestPartialInterface::CONST_IMPL, TestInterfaceEnumCONST_IMPLIsWrongUseDoNotCheckConstants);
|
| #endif
|
|
|
| -v8::Handle<v8::Value> V8TestInterface::constructorCallback(const v8::Arguments& args)
|
| +void V8TestInterface::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
|
| {
|
| - if (!args.IsConstructCall())
|
| - return throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
|
| + if (!args.IsConstructCall()) {
|
| + throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
|
| + return;
|
| + }
|
|
|
| - if (ConstructorMode::current() == ConstructorMode::WrapExistingObject)
|
| - return args.Holder();
|
| + if (ConstructorMode::current() == ConstructorMode::WrapExistingObject) {
|
| + args.GetReturnValue().Set(args.Holder());
|
| + return;
|
| + }
|
|
|
| - return TestInterfaceV8Internal::constructor(args);
|
| + TestInterfaceV8Internal::constructor(args);
|
| }
|
|
|
| v8::Handle<v8::Value> V8TestInterface::namedPropertyGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
|
|