Revert 128789 - IndexedDB: Use ScriptValue instead of SerializedScriptValue for get/openCursor

Source/WebCore/Modules/indexeddb/IDBAny.h

 /*
  * Copyright (C) 2010 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 10 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef IDBAny_h
 #define IDBAny_h
 
 #if ENABLE(INDEXED_DATABASE)
 
-#include "ScriptValue.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
 class DOMStringList;
 class IDBCursor;
 class IDBCursorWithValue;
 class IDBDatabase;
 class IDBFactory;
 class IDBIndex;
 class IDBKey;
 class IDBKeyPath;
 class IDBObjectStore;
 class IDBTransaction;
+class SerializedScriptValue;
 
 class IDBAny : public RefCounted<IDBAny> {
 public:
     static PassRefPtr<IDBAny> createInvalid();
     static PassRefPtr<IDBAny> createNull();
     static PassRefPtr<IDBAny> createString(const String&);
     template<typename T>
     static PassRefPtr<IDBAny> create(T* idbObject)
     {
         RefPtr<IDBAny> any = IDBAny::createInvalid();
         any->set(idbObject);
         return any.release();
     }
-    template<typename T>
-    static PassRefPtr<IDBAny> create(const T& idbObject)
+    static PassRefPtr<IDBAny> create(const IDBKeyPath& keyPath)
     {
         RefPtr<IDBAny> any = IDBAny::createInvalid();
-        any->set(idbObject);
+        any->set(keyPath);
         return any.release();
     }
     template<typename T>
     static PassRefPtr<IDBAny> create(PassRefPtr<T> idbObject)
     {
         RefPtr<IDBAny> any = IDBAny::createInvalid();
         any->set(idbObject);
         return any.release();
     }
-    static PassRefPtr<IDBAny> create(int64_t value)
-    {
-        RefPtr<IDBAny> any = IDBAny::createInvalid();
-        any->set(value);
-        return any.release();
-    }
     ~IDBAny();
 
     enum Type {
         UndefinedType = 0,
         NullType,
         DOMStringListType,
         IDBCursorType,
         IDBCursorWithValueType,
         IDBDatabaseType,
         IDBFactoryType,
         IDBIndexType,
         IDBKeyType,
         IDBObjectStoreType,
         IDBTransactionType,
-        ScriptValueType,
-        IntegerType,
+        SerializedScriptValueType,
         StringType,
     };
 
     Type type() const { return m_type; }
     // Use type() to figure out which one of these you're allowed to call.
     PassRefPtr<DOMStringList> domStringList();
     PassRefPtr<IDBCursor> idbCursor();
     PassRefPtr<IDBCursorWithValue> idbCursorWithValue();
     PassRefPtr<IDBDatabase> idbDatabase();
     PassRefPtr<IDBFactory> idbFactory();
     PassRefPtr<IDBIndex> idbIndex();
     PassRefPtr<IDBKey> idbKey();
     PassRefPtr<IDBObjectStore> idbObjectStore();
     PassRefPtr<IDBTransaction> idbTransaction();
-    ScriptValue scriptValue();
-    int64_t integer();
+    PassRefPtr<SerializedScriptValue> serializedScriptValue();
     const String& string();
 
     // Set can only be called once.
     void setNull();
     void set(PassRefPtr<DOMStringList>);
     void set(PassRefPtr<IDBCursor>);
     void set(PassRefPtr<IDBCursorWithValue>);
     void set(PassRefPtr<IDBDatabase>);
     void set(PassRefPtr<IDBFactory>);
     void set(PassRefPtr<IDBIndex>);
     void set(PassRefPtr<IDBKey>);
     void set(PassRefPtr<IDBObjectStore>);
     void set(PassRefPtr<IDBTransaction>);
+    void set(PassRefPtr<SerializedScriptValue>);
     void set(const IDBKeyPath&);
     void set(const String&);
-    void set(const ScriptValue&);
-    void set(int64_t);
 
 private:
     IDBAny();
 
     Type m_type;
 
     // Only one of the following should ever be in use at any given time.
     RefPtr<DOMStringList> m_domStringList;
     RefPtr<IDBCursor> m_idbCursor;
     RefPtr<IDBCursorWithValue> m_idbCursorWithValue;
     RefPtr<IDBDatabase> m_idbDatabase;
     RefPtr<IDBFactory> m_idbFactory;
     RefPtr<IDBIndex> m_idbIndex;
     RefPtr<IDBKey> m_idbKey;
     RefPtr<IDBObjectStore> m_idbObjectStore;
     RefPtr<IDBTransaction> m_idbTransaction;
-    ScriptValue m_scriptValue;
+    RefPtr<SerializedScriptValue> m_serializedScriptValue;
     String m_string;
-    int64_t m_integer;
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(INDEXED_DATABASE)
 
 #endif // IDBAny_h