From 967717af5423377c967781471ee106e2bb4e11c8 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 22 Jul 2010 15:37:06 +0100
Subject: Merge WebKit at r63859 : Initial merge by git.

Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
---
 WebCore/bindings/v8/ScriptArray.h | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'WebCore/bindings/v8/ScriptArray.h')

diff --git a/WebCore/bindings/v8/ScriptArray.h b/WebCore/bindings/v8/ScriptArray.h
index 9f40fbf..9aa8764 100644
--- a/WebCore/bindings/v8/ScriptArray.h
+++ b/WebCore/bindings/v8/ScriptArray.h
@@ -36,24 +36,26 @@
 #include <v8.h>
 
 namespace WebCore {
-    class ScriptState;
-
-    class ScriptArray : public ScriptObject {
-    public:
-        ScriptArray(ScriptState* scriptState, v8::Handle<v8::Array>);
-        ScriptArray() {};
-        virtual ~ScriptArray() {}
-
-        bool set(unsigned index, const ScriptObject&);
-        bool set(unsigned index, const String&);
-        bool set(unsigned index, double);
-        bool set(unsigned index, long long);
-        bool set(unsigned index, int);
-        bool set(unsigned index, bool);
-        unsigned length();
-
-        static ScriptArray createNew(ScriptState*);
-    };
+class ScriptState;
+class SerializedScriptValue;
+
+class ScriptArray : public ScriptObject {
+public:
+    ScriptArray(ScriptState* scriptState, v8::Handle<v8::Array>);
+    ScriptArray() {};
+    virtual ~ScriptArray() {}
+
+    bool set(unsigned index, const ScriptObject&);
+    bool set(unsigned index, SerializedScriptValue*);
+    bool set(unsigned index, const String&);
+    bool set(unsigned index, double);
+    bool set(unsigned index, long long);
+    bool set(unsigned index, int);
+    bool set(unsigned index, bool);
+    unsigned length();
+
+    static ScriptArray createNew(ScriptState*);
+};
 }
 
 #endif // ScriptArray_h
-- 
cgit v1.1