Changeset 28781 in webkit

Timestamp:

Dec 16, 2007 4:24:48 PM (16 years ago)

Author:

Darin Adler

Message:

WebCore:

Reviewed by Darin.

More of ​http://bugs.webkit.org/show_bug.cgi?id=16385
Cleanup kjs_window

• Move PausedTimeouts into its own file and put it in the WebCore namespace.

• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• WebCoreSources.bkl:
• bindings/js/PausedTimeouts.cpp: Copied from bindings/js/kjs_window.cpp.
• bindings/js/PausedTimeouts.h: Copied from bindings/js/kjs_window.h.
• bindings/js/kjs_window.cpp: (KJS::Window::pauseTimeouts):
• bindings/js/kjs_window.h:
• history/CachedPage.cpp:
• history/CachedPage.h:
• page/Chrome.cpp:

LayoutTests:

Reviewed by Maciej.

• tests for the argument handling of the executeSql function

• storage/execute-sql-args-expected.txt: Added.
• storage/execute-sql-args.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/execute-sql-args-expected.txt (added)
• LayoutTests/storage/execute-sql-args.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSSQLTransactionCustom.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-12-16  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        - tests for the argument handling of the executeSql function
+
+        * storage/execute-sql-args-expected.txt: Added.
+        * storage/execute-sql-args.html: Added.
+
 2007-12-16  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ -31 +31 @@
         * rendering/RenderObject.cpp:
         (WebCore::RenderObject::paintBorderImage):
+
+2007-12-16  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        - fix <rdar://problem/5636065> First form of SQLTransaction.executeSql() fails with TYPE_ERROR dom exception
+
+        Test: storage/execute-sql-args.html
+
+        * bindings/js/JSSQLTransactionCustom.cpp:
+        (WebCore::JSSQLTransaction::executeSql): Added exception handling code so that once an
+        exception happens, we won't try to do any more argument processing. Changed processing
+        of the second argument so that we allow an undefined value or null, and simply omit the
+        array. Changed processing of the second argument so that we don't require an actual
+        JavaScript array. Instead, as with the JavaScript array operations themselves, we use
+        the length property and corresponding numeric properties of the object, allowing other
+        objects to act as arrays. Changed processing of the third and fourth arguments to
+        allow the undefined value as well as null; we check the value of the argument rather
+        than looking at the size of the passed-in arguments list.
 
 2007-12-16  Darin Adler  <darin@apple.com>

trunk/WebCore/bindings/js/JSSQLTransactionCustom.cpp

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include "config.h"
 #include "JSSQLTransaction.h"
@@ -33 +34 @@
 #include "JSCustomSQLStatementCallback.h"
 #include "JSCustomSQLStatementErrorCallback.h"
+#include "SQLTransaction.h"
 #include "kjs_window.h"
-#include "PlatformString.h"
-#include "SQLTransaction.h"
-#include "SQLValue.h"
-#include <kjs/array_instance.h>
 
 using namespace KJS;
@@ -46 +44 @@
 {
     String sqlStatement = args[0]->toString(exec);
-    
+    if (exec->hadException())
+        return jsUndefined();
+
     // Now assemble the list of SQL arguments
     Vector<SQLValue> sqlValues;
-    
-    if (!args[1]->isObject() ||
-        !static_cast<JSObject*>(args[1])->inherits(&ArrayInstance::info)) {
-        setDOMException(exec, TYPE_MISMATCH_ERR);
-        return jsUndefined();
-    }
-    
-    ArrayInstance* array = static_cast<ArrayInstance*>(args[1]);
-    
-    for (unsigned i = 0 ; i < array->getLength(); i++) {
-        JSValue* value = array->getItem(i);
+    if (!args[1]->isUndefinedOrNull()) {
+        JSObject* object = args[1]->getObject();
+        if (!object) {
+            setDOMException(exec, TYPE_MISMATCH_ERR);
+            return jsUndefined();
+        }
+
+        JSValue* lengthValue = object->get(exec, exec->propertyNames().length);
+        if (exec->hadException())
+            return jsUndefined();
+        unsigned length = lengthValue->toUInt32(exec);
+        if (exec->hadException())
+            return jsUndefined();
         
-        if (value->isNull()) {
-            sqlValues.append(SQLValue());
-        } else if (value->isNumber()) {
-            sqlValues.append(value->getNumber());
-        } else {
-            // Convert the argument to a string and append it
-            sqlValues.append(value->toString(exec));
+        for (unsigned i = 0 ; i < length; ++i) {
+            JSValue* value = object->get(exec, i);
+            if (exec->hadException())
+                return jsUndefined();
+            
+            if (value->isNull())
+                sqlValues.append(SQLValue());
+            else if (value->isNumber())
+                sqlValues.append(value->getNumber());
+            else {
+                // Convert the argument to a string and append it
+                sqlValues.append(value->toString(exec));
+                if (exec->hadException())
+                    return jsUndefined();
+            }
         }
     }
 
     RefPtr<SQLStatementCallback> callback;
-    if (args.size() > 2 && !args[2]->isNull()) {
+    if (!args[2]->isUndefinedOrNull()) {
         JSObject* object = args[2]->getObject();
         if (!object) {
@@ -84 +94 @@
     
     RefPtr<SQLStatementErrorCallback> errorCallback;
-    if (args.size() > 3 && !args[3]->isNull()) {
+    if (!args[3]->isUndefinedOrNull()) {
         JSObject* object = args[3]->getObject();
         if (!object) {