| Index: Source/bindings/v8/custom/V8SQLTransactionCustom.cpp
|
| diff --git a/Source/bindings/v8/custom/V8SQLTransactionCustom.cpp b/Source/bindings/v8/custom/V8SQLTransactionCustom.cpp
|
| index 9dd4a9d50f88d78a448b9e62a7e65e5a14778682..49cfff3e7ca86dfa72ca5b2aa0963fce9cc7a064 100644
|
| --- a/Source/bindings/v8/custom/V8SQLTransactionCustom.cpp
|
| +++ b/Source/bindings/v8/custom/V8SQLTransactionCustom.cpp
|
| @@ -44,25 +44,25 @@ using namespace WTF;
|
|
|
| namespace WebCore {
|
|
|
| -void V8SQLTransaction::executeSqlMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
|
| +void V8SQLTransaction::executeSqlMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - if (!args.Length()) {
|
| - setDOMException(SyntaxError, args.GetIsolate());
|
| + if (!info.Length()) {
|
| + setDOMException(SyntaxError, info.GetIsolate());
|
| return;
|
| }
|
|
|
| - V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, statement, args[0]);
|
| + V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, statement, info[0]);
|
|
|
| Vector<SQLValue> sqlValues;
|
|
|
| - if (args.Length() > 1 && !isUndefinedOrNull(args[1])) {
|
| - if (!args[1]->IsObject()) {
|
| - setDOMException(TypeMismatchError, args.GetIsolate());
|
| + if (info.Length() > 1 && !isUndefinedOrNull(info[1])) {
|
| + if (!info[1]->IsObject()) {
|
| + setDOMException(TypeMismatchError, info.GetIsolate());
|
| return;
|
| }
|
|
|
| uint32_t sqlArgsLength = 0;
|
| - v8::Local<v8::Object> sqlArgsObject = args[1]->ToObject();
|
| + v8::Local<v8::Object> sqlArgsObject = info[1]->ToObject();
|
| V8TRYCATCH_VOID(v8::Local<v8::Value>, length, sqlArgsObject->Get(v8::String::NewSymbol("length")));
|
|
|
| if (isUndefinedOrNull(length))
|
| @@ -71,7 +71,7 @@ void V8SQLTransaction::executeSqlMethodCustom(const v8::FunctionCallbackInfo<v8:
|
| sqlArgsLength = length->Uint32Value();
|
|
|
| for (unsigned int i = 0; i < sqlArgsLength; ++i) {
|
| - v8::Handle<v8::Integer> key = v8::Integer::New(i, args.GetIsolate());
|
| + v8::Handle<v8::Integer> key = v8::Integer::New(i, info.GetIsolate());
|
| V8TRYCATCH_VOID(v8::Local<v8::Value>, value, sqlArgsObject->Get(key));
|
|
|
| if (value.IsEmpty() || value->IsNull())
|
| @@ -86,29 +86,29 @@ void V8SQLTransaction::executeSqlMethodCustom(const v8::FunctionCallbackInfo<v8:
|
| }
|
| }
|
|
|
| - SQLTransaction* transaction = V8SQLTransaction::toNative(args.Holder());
|
| + SQLTransaction* transaction = V8SQLTransaction::toNative(info.Holder());
|
|
|
| ExecutionContext* executionContext = getExecutionContext();
|
|
|
| RefPtr<SQLStatementCallback> callback;
|
| - if (args.Length() > 2 && !isUndefinedOrNull(args[2])) {
|
| - if (!args[2]->IsObject()) {
|
| - setDOMException(TypeMismatchError, args.GetIsolate());
|
| + if (info.Length() > 2 && !isUndefinedOrNull(info[2])) {
|
| + if (!info[2]->IsObject()) {
|
| + setDOMException(TypeMismatchError, info.GetIsolate());
|
| return;
|
| }
|
| - callback = V8SQLStatementCallback::create(args[2], executionContext);
|
| + callback = V8SQLStatementCallback::create(info[2], executionContext);
|
| }
|
|
|
| RefPtr<SQLStatementErrorCallback> errorCallback;
|
| - if (args.Length() > 3 && !isUndefinedOrNull(args[3])) {
|
| - if (!args[3]->IsObject()) {
|
| - setDOMException(TypeMismatchError, args.GetIsolate());
|
| + if (info.Length() > 3 && !isUndefinedOrNull(info[3])) {
|
| + if (!info[3]->IsObject()) {
|
| + setDOMException(TypeMismatchError, info.GetIsolate());
|
| return;
|
| }
|
| - errorCallback = V8SQLStatementErrorCallback::create(args[3], executionContext);
|
| + errorCallback = V8SQLStatementErrorCallback::create(info[3], executionContext);
|
| }
|
|
|
| - ExceptionState es(args.GetIsolate());
|
| + ExceptionState es(info.GetIsolate());
|
| transaction->executeSQL(statement, sqlValues, callback, errorCallback, es);
|
| es.throwIfNeeded();
|
| }
|
|
|