Changeset 59095 in webkit

Timestamp:

May 10, 2010 1:46:34 PM (14 years ago)

Author:

dumi@chromium.org

Message:

Clean up and fix the existing V8 DB bindings.
​https://bugs.webkit.org/show_bug.cgi?id=34994

Reviewed by Adam Barth.

• bindings/v8/custom/V8DOMWindowCustom.cpp:

(WebCore::V8DOMWindow::openDatabaseCallback):

• bindings/v8/custom/V8DatabaseCustom.cpp:

(WebCore::V8Database::changeVersionCallback):
(WebCore::createTransaction):

• bindings/v8/custom/V8SQLTransactionCustom.cpp:

(WebCore::V8SQLTransaction::executeSqlCallback):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/custom/V8DOMWindowCustom.cpp (modified) (3 diffs)
• bindings/v8/custom/V8DatabaseCustom.cpp (modified) (10 diffs)
• bindings/v8/custom/V8SQLTransactionCustom.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-10  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Clean up and fix the existing V8 DB bindings.
+        https://bugs.webkit.org/show_bug.cgi?id=34994
+
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        (WebCore::V8DOMWindow::openDatabaseCallback):
+        * bindings/v8/custom/V8DatabaseCustom.cpp:
+        (WebCore::V8Database::changeVersionCallback):
+        (WebCore::createTransaction):
+        * bindings/v8/custom/V8SQLTransactionCustom.cpp:
+        (WebCore::V8SQLTransaction::executeSqlCallback):
+
 2010-05-10  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

@@ -53 +53 @@
 #include "V8Binding.h"
 #include "V8BindingDOMWindow.h"
+#include "V8BindingMacros.h"
 #include "V8BindingState.h"
 #include "V8CustomEventListener.h"
@@ -720 +721 @@
     INC_STATS("DOM.DOMWindow.openDatabase");
     if (args.Length() < 4)
-        return v8::Undefined();
+        return throwError(SYNTAX_ERR);
+
+    EXCEPTION_BLOCK(String, name, toWebCoreString(args[0]));
+    EXCEPTION_BLOCK(String, version, toWebCoreString(args[1]));
+    EXCEPTION_BLOCK(String, displayName, toWebCoreString(args[2]));
+    EXCEPTION_BLOCK(unsigned long, estimatedSize, args[3]->Uint32Value());
 
     DOMWindow* imp = V8DOMWindow::toNative(args.Holder());
@@ -726 +732 @@
         return v8::Undefined();
 
+    RefPtr<DatabaseCallback> creationCallback;
+    if (args.Length() >= 5) {
+        if (!args[4]->IsObject())
+            return throwError(TYPE_MISMATCH_ERR);
+
+        creationCallback = V8DatabaseCallback::create(args[4], imp->frame());
+    }
+
     ExceptionCode ec = 0;
-    String name = toWebCoreString(args[0]);
-    String version = toWebCoreString(args[1]);
-    String displayName = toWebCoreString(args[2]);
-    unsigned long estimatedSize = args[3]->IntegerValue();
-    RefPtr<DatabaseCallback> creationCallback;
-    if ((args.Length() >= 5) && args[4]->IsObject())
-        creationCallback = V8DatabaseCallback::create(args[4], imp->frame());
-
     v8::Handle<v8::Value> result = toV8(imp->openDatabase(name, version, displayName, estimatedSize, creationCallback.release(), ec));
 

trunk/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -15 +15 @@
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -36 +36 @@
 #include "Database.h"
 #include "V8Binding.h"
+#include "V8BindingMacros.h"
 #include "V8SQLTransactionCallback.h"
 #include "V8SQLTransactionErrorCallback.h"
@@ -48 +49 @@
 
     if (args.Length() < 2)
-        return throwError("The old and new version strings are required.", V8Proxy::SyntaxError);
+        return throwError(SYNTAX_ERR);
 
-    if (!(args[0]->IsString() && args[1]->IsString()))
-        return throwError("The old and new versions must be strings.");
+    EXCEPTION_BLOCK(String, oldVersion, toWebCoreString(args[0]));
+    EXCEPTION_BLOCK(String, newVersion, toWebCoreString(args[1]));
 
     Database* database = V8Database::toNative(args.Holder());
@@ -62 +63 @@
     if (args.Length() > 2) {
         if (!args[2]->IsObject())
-            return throwError("changeVersion transaction callback must be of valid type.");
+            return throwError(TYPE_MISMATCH_ERR);
 
         callback = V8SQLTransactionCallback::create(args[2], frame);
@@ -70 +71 @@
     if (args.Length() > 3) {
         if (!args[3]->IsObject())
-            return throwError("changeVersion error callback must be of valid type.");
+            return throwError(TYPE_MISMATCH_ERR);
 
         errorCallback = V8SQLTransactionErrorCallback::create(args[3], frame);
@@ -78 +79 @@
     if (args.Length() > 4) {
         if (!args[4]->IsObject())
-            return throwError("changeVersion success callback must be of valid type.");
+            return throwError(TYPE_MISMATCH_ERR);
 
         successCallback = V8CustomVoidCallback::create(args[4], frame);
     }
 
-    database->changeVersion(toWebCoreString(args[0]), toWebCoreString(args[1]), callback.release(), errorCallback.release(), successCallback.release());
+    database->changeVersion(oldVersion, newVersion, callback.release(), errorCallback.release(), successCallback.release());
 
     return v8::Undefined();
@@ -91 +92 @@
 {
     if (!args.Length())
-        return throwError("Transaction callback is required.", V8Proxy::SyntaxError);
+        return throwError(SYNTAX_ERR);
 
     if (!args[0]->IsObject())
-        return throwError("Transaction callback must be of valid type.");
+        return throwError(TYPE_MISMATCH_ERR);
 
     Database* database = V8Database::toNative(args.Holder());
@@ -107 +108 @@
     if (args.Length() > 1 && !isUndefinedOrNull(args[1])) {
         if (!args[1]->IsObject())
-            return throwError("Transaction error callback must be of valid type.");
+            return throwError(TYPE_MISMATCH_ERR);
 
         errorCallback = V8SQLTransactionErrorCallback::create(args[1], frame);
@@ -115 +116 @@
     if (args.Length() > 2 && !isUndefinedOrNull(args[2])) {
         if (!args[2]->IsObject())
-            return throwError("Transaction success callback must be of valid type.");
+            return throwError(TYPE_MISMATCH_ERR);
 
         successCallback = V8CustomVoidCallback::create(args[2], frame);

trunk/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -15 +15 @@
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -38 +38 @@
 #include "SQLValue.h"
 #include "V8Binding.h"
+#include "V8BindingMacros.h"
 #include "V8SQLStatementCallback.h"
 #include "V8SQLStatementErrorCallback.h"
@@ -52 +53 @@
 
     if (args.Length() == 0)
-        return throwError("SQL statement is required.", V8Proxy::SyntaxError);
+        return throwError(SYNTAX_ERR);
 
-    String statement = toWebCoreString(args[0]);
+    EXCEPTION_BLOCK(String, statement, toWebCoreString(args[0]));
 
     Vector<SQLValue> sqlValues;
 
     if (args.Length() > 1 && !isUndefinedOrNull(args[1])) {
-        if (args[1]->IsObject()) {
-            uint32_t sqlArgsLength = 0;
-            v8::Local<v8::Object> sqlArgsObject = args[1]->ToObject();
-            v8::Local<v8::Value> lengthGetter;
-            {
-                v8::TryCatch block;
-                lengthGetter = sqlArgsObject->Get(v8::String::New("length"));
-                if (block.HasCaught())
-                    return throwError(block.Exception());
+        if (!args[1]->IsObject())
+            return throwError(TYPE_MISMATCH_ERR);
+
+        uint32_t sqlArgsLength = 0;
+        v8::Local<v8::Object> sqlArgsObject = args[1]->ToObject();
+        EXCEPTION_BLOCK(v8::Local<v8::Value>, length, sqlArgsObject->Get(v8::String::New("length")));
+
+        if (isUndefinedOrNull(length))
+            sqlArgsLength = sqlArgsObject->GetPropertyNames()->Length();
+        else
+            sqlArgsLength = length->Uint32Value();
+
+        for (unsigned int i = 0; i < sqlArgsLength; ++i) {
+            v8::Local<v8::Integer> key = v8::Integer::New(i);
+            EXCEPTION_BLOCK(v8::Local<v8::Value>, value, sqlArgsObject->Get(key));
+
+            if (value.IsEmpty() || value->IsNull())
+                sqlValues.append(SQLValue());
+            else if (value->IsNumber()) {
+                EXCEPTION_BLOCK(double, sqlValue, value->NumberValue());
+                sqlValues.append(SQLValue(sqlValue));
+            } else {
+                EXCEPTION_BLOCK(String, sqlValue, toWebCoreString(value));
+                sqlValues.append(SQLValue(sqlValue));
             }
-
-            if (isUndefinedOrNull(lengthGetter))
-                sqlArgsLength = sqlArgsObject->GetPropertyNames()->Length();
-            else
-                sqlArgsLength = lengthGetter->Uint32Value();
-
-            for (unsigned int i = 0; i < sqlArgsLength; ++i) {
-                v8::Local<v8::Integer> key = v8::Integer::New(i);
-                v8::Local<v8::Value> value;
-                {
-                    v8::TryCatch block;
-                    value = sqlArgsObject->Get(key);
-                    if (block.HasCaught())
-                        return throwError(block.Exception());
-                }
-
-                if (value.IsEmpty() || value->IsNull())
-                    sqlValues.append(SQLValue());
-                else if (value->IsNumber())
-                    sqlValues.append(SQLValue(value->NumberValue()));
-                else
-                    sqlValues.append(SQLValue(toWebCoreString(value)));
-            }
-        } else
-            return throwError("sqlArgs should be array or object!", V8Proxy::TypeError);
+        }
     }
 
@@ -103 +95 @@
     if (args.Length() > 2 && !isUndefinedOrNull(args[2])) {
         if (!args[2]->IsObject())
-            return throwError("Statement callback must be of valid type.", V8Proxy::TypeError);
+            return throwError(TYPE_MISMATCH_ERR);
 
         if (frame)
@@ -112 +104 @@
     if (args.Length() > 3 && !isUndefinedOrNull(args[3])) {
         if (!args[3]->IsObject())
-            return throwError("Statement error callback must be of valid type.", V8Proxy::TypeError);
+            return throwError(TYPE_MISMATCH_ERR);
 
         if (frame)