summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/js/JSDatabaseCustom.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/bindings/js/JSDatabaseCustom.cpp')
-rw-r--r--WebCore/bindings/js/JSDatabaseCustom.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/WebCore/bindings/js/JSDatabaseCustom.cpp b/WebCore/bindings/js/JSDatabaseCustom.cpp
index f17340c..9ee61a5 100644
--- a/WebCore/bindings/js/JSDatabaseCustom.cpp
+++ b/WebCore/bindings/js/JSDatabaseCustom.cpp
@@ -45,17 +45,17 @@ namespace WebCore {
using namespace JSC;
-JSValue* JSDatabase::changeVersion(ExecState* exec, const ArgList& args)
+JSValuePtr JSDatabase::changeVersion(ExecState* exec, const ArgList& args)
{
- String oldVersion = args.at(exec, 0)->toString(exec);
- String newVersion = args.at(exec, 1)->toString(exec);
+ String oldVersion = args.at(exec, 0).toString(exec);
+ String newVersion = args.at(exec, 1).toString(exec);
Frame* frame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame();
if (!frame)
return jsUndefined();
- JSObject *object;
- if (!(object = args.at(exec, 2)->getObject())) {
+ JSObject* object;
+ if (!(object = args.at(exec, 2).getObject())) {
setDOMException(exec, TYPE_MISMATCH_ERR);
return jsUndefined();
}
@@ -63,8 +63,8 @@ JSValue* JSDatabase::changeVersion(ExecState* exec, const ArgList& args)
RefPtr<SQLTransactionCallback> callback(JSCustomSQLTransactionCallback::create(object, frame));
RefPtr<SQLTransactionErrorCallback> errorCallback;
- if (!args.at(exec, 3)->isNull()) {
- if (!(object = args.at(exec, 3)->getObject())) {
+ if (!args.at(exec, 3).isNull()) {
+ if (!(object = args.at(exec, 3).getObject())) {
setDOMException(exec, TYPE_MISMATCH_ERR);
return jsUndefined();
}
@@ -73,7 +73,7 @@ JSValue* JSDatabase::changeVersion(ExecState* exec, const ArgList& args)
}
RefPtr<VoidCallback> successCallback;
- if (!args.at(exec, 4)->isNull()) {
+ if (!args.at(exec, 4).isNull()) {
successCallback = toVoidCallback(exec, args.at(exec, 4));
if (!successCallback) {
setDOMException(exec, TYPE_MISMATCH_ERR);
@@ -86,11 +86,11 @@ JSValue* JSDatabase::changeVersion(ExecState* exec, const ArgList& args)
return jsUndefined();
}
-JSValue* JSDatabase::transaction(ExecState* exec, const ArgList& args)
+JSValuePtr JSDatabase::transaction(ExecState* exec, const ArgList& args)
{
JSObject* object;
- if (!(object = args.at(exec, 0)->getObject())) {
+ if (!(object = args.at(exec, 0).getObject())) {
setDOMException(exec, TYPE_MISMATCH_ERR);
return jsUndefined();
}
@@ -102,8 +102,8 @@ JSValue* JSDatabase::transaction(ExecState* exec, const ArgList& args)
RefPtr<SQLTransactionCallback> callback(JSCustomSQLTransactionCallback::create(object, frame));
RefPtr<SQLTransactionErrorCallback> errorCallback;
- if (args.size() > 1 && !args.at(exec, 1)->isNull()) {
- if (!(object = args.at(exec, 1)->getObject())) {
+ if (args.size() > 1 && !args.at(exec, 1).isNull()) {
+ if (!(object = args.at(exec, 1).getObject())) {
setDOMException(exec, TYPE_MISMATCH_ERR);
return jsUndefined();
}
@@ -112,7 +112,7 @@ JSValue* JSDatabase::transaction(ExecState* exec, const ArgList& args)
}
RefPtr<VoidCallback> successCallback;
- if (args.size() > 2 && !args.at(exec, 2)->isNull()) {
+ if (args.size() > 2 && !args.at(exec, 2).isNull()) {
successCallback = toVoidCallback(exec, args.at(exec, 2));
if (!successCallback) {
setDOMException(exec, TYPE_MISMATCH_ERR);