diff options
Diffstat (limited to 'WebCore/bindings/js/JSSQLTransactionCustom.cpp')
-rw-r--r-- | WebCore/bindings/js/JSSQLTransactionCustom.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/WebCore/bindings/js/JSSQLTransactionCustom.cpp b/WebCore/bindings/js/JSSQLTransactionCustom.cpp index 5138517..a0f173f 100644 --- a/WebCore/bindings/js/JSSQLTransactionCustom.cpp +++ b/WebCore/bindings/js/JSSQLTransactionCustom.cpp @@ -40,40 +40,40 @@ using namespace JSC; namespace WebCore { -JSValue* JSSQLTransaction::executeSql(ExecState* exec, const ArgList& args) +JSValuePtr JSSQLTransaction::executeSql(ExecState* exec, const ArgList& args) { - String sqlStatement = args.at(exec, 0)->toString(exec); + String sqlStatement = args.at(exec, 0).toString(exec); if (exec->hadException()) return jsUndefined(); // Now assemble the list of SQL arguments Vector<SQLValue> sqlValues; - if (!args.at(exec, 1)->isUndefinedOrNull()) { - JSObject* object = args.at(exec, 1)->getObject(); + if (!args.at(exec, 1).isUndefinedOrNull()) { + JSObject* object = args.at(exec, 1).getObject(); if (!object) { setDOMException(exec, TYPE_MISMATCH_ERR); return jsUndefined(); } - JSValue* lengthValue = object->get(exec, exec->propertyNames().length); + JSValuePtr lengthValue = object->get(exec, exec->propertyNames().length); if (exec->hadException()) return jsUndefined(); - unsigned length = lengthValue->toUInt32(exec); + unsigned length = lengthValue.toUInt32(exec); if (exec->hadException()) return jsUndefined(); for (unsigned i = 0 ; i < length; ++i) { - JSValue* value = object->get(exec, i); + JSValuePtr value = object->get(exec, i); if (exec->hadException()) return jsUndefined(); - if (value->isNull()) + if (value.isNull()) sqlValues.append(SQLValue()); - else if (value->isNumber()) - sqlValues.append(value->getNumber()); + else if (value.isNumber()) + sqlValues.append(value.uncheckedGetNumber()); else { // Convert the argument to a string and append it - sqlValues.append(value->toString(exec)); + sqlValues.append(value.toString(exec)); if (exec->hadException()) return jsUndefined(); } @@ -81,8 +81,8 @@ JSValue* JSSQLTransaction::executeSql(ExecState* exec, const ArgList& args) } RefPtr<SQLStatementCallback> callback; - if (!args.at(exec, 2)->isUndefinedOrNull()) { - JSObject* object = args.at(exec, 2)->getObject(); + if (!args.at(exec, 2).isUndefinedOrNull()) { + JSObject* object = args.at(exec, 2).getObject(); if (!object) { setDOMException(exec, TYPE_MISMATCH_ERR); return jsUndefined(); @@ -93,8 +93,8 @@ JSValue* JSSQLTransaction::executeSql(ExecState* exec, const ArgList& args) } RefPtr<SQLStatementErrorCallback> errorCallback; - if (!args.at(exec, 3)->isUndefinedOrNull()) { - JSObject* object = args.at(exec, 3)->getObject(); + if (!args.at(exec, 3).isUndefinedOrNull()) { + JSObject* object = args.at(exec, 3).getObject(); if (!object) { setDOMException(exec, TYPE_MISMATCH_ERR); return jsUndefined(); |