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

Source/WebCore/Modules/indexeddb/IDBAny.cpp

 /*
  * 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 16 matching lines @@
 #include "IDBAny.h"
 
 #if ENABLE(INDEXED_DATABASE)
 
 #include "IDBCursorWithValue.h"
 #include "IDBDatabase.h"
 #include "IDBFactory.h"
 #include "IDBIndex.h"
 #include "IDBKeyPath.h"
 #include "IDBObjectStore.h"
+#include "SerializedScriptValue.h"
 
 namespace WebCore {
 
 PassRefPtr<IDBAny> IDBAny::createInvalid()
 {
     return adoptRef(new IDBAny());
 }
 
 PassRefPtr<IDBAny> IDBAny::createNull()
 {
@@ skipping 65 matching lines @@
     ASSERT(m_type == IDBObjectStoreType);
     return m_idbObjectStore;
 }
 
 PassRefPtr<IDBTransaction> IDBAny::idbTransaction()
 {
     ASSERT(m_type == IDBTransactionType);
     return m_idbTransaction;
 }
 
-ScriptValue IDBAny::scriptValue()
+PassRefPtr<SerializedScriptValue> IDBAny::serializedScriptValue()
 {
-    ASSERT(m_type == ScriptValueType);
-    return m_scriptValue;
+    ASSERT(m_type == SerializedScriptValueType);
+    return m_serializedScriptValue;
 }
 
 const String& IDBAny::string()
 {
     ASSERT(m_type == StringType);
     return m_string;
 }
 
-int64_t IDBAny::integer()
-{
-    ASSERT(m_type == IntegerType);
-    return m_integer;
-}
-
 void IDBAny::setNull()
 {
     ASSERT(m_type == UndefinedType);
     m_type = NullType;
 }
 
 void IDBAny::set(PassRefPtr<DOMStringList> value)
 {
     ASSERT(m_type == UndefinedType);
     m_type = DOMStringListType;
@@ skipping 49 matching lines @@
     m_idbTransaction = value;
 }
 
 void IDBAny::set(PassRefPtr<IDBObjectStore> value)
 {
     ASSERT(m_type == UndefinedType);
     m_type = IDBObjectStoreType;
     m_idbObjectStore = value;
 }
 
-void IDBAny::set(const ScriptValue& value)
+void IDBAny::set(PassRefPtr<SerializedScriptValue> value)
 {
     ASSERT(m_type == UndefinedType);
-    m_type = ScriptValueType;
-    m_scriptValue = value;
+    m_type = SerializedScriptValueType;
+    m_serializedScriptValue = value;
 }
 
 void IDBAny::set(const IDBKeyPath& value)
 {
     ASSERT(m_type == UndefinedType);
     switch (value.type()) {
     case IDBKeyPath::NullType:
         m_type = NullType;
         break;
     case IDBKeyPath::StringType:
@@ skipping 10 matching lines @@
     }
 }
 
 void IDBAny::set(const String& value)
 {
     ASSERT(m_type == UndefinedType);
     m_type = StringType;
     m_string = value;
 }
 
-void IDBAny::set(int64_t value)
-{
-    ASSERT(m_type == UndefinedType);
-    m_type = IntegerType;
-    m_integer = value;
-}
-
 } // namespace WebCore
 
 #endif