Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Unified Diff: Source/WebCore/Modules/indexeddb/IDBAny.cpp

Issue 11348011: Revert 128789 - IndexedDB: Use ScriptValue instead of SerializedScriptValue for get/openCursor (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/Modules/indexeddb/IDBAny.h ('k') | Source/WebCore/Modules/indexeddb/IDBCursor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/Modules/indexeddb/IDBAny.cpp
===================================================================
--- Source/WebCore/Modules/indexeddb/IDBAny.cpp (revision 132816)
+++ Source/WebCore/Modules/indexeddb/IDBAny.cpp (working copy)
@@ -34,6 +34,7 @@
#include "IDBIndex.h"
#include "IDBKeyPath.h"
#include "IDBObjectStore.h"
+#include "SerializedScriptValue.h"
namespace WebCore {
@@ -119,10 +120,10 @@
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()
@@ -131,12 +132,6 @@
return m_string;
}
-int64_t IDBAny::integer()
-{
- ASSERT(m_type == IntegerType);
- return m_integer;
-}
-
void IDBAny::setNull()
{
ASSERT(m_type == UndefinedType);
@@ -206,11 +201,11 @@
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)
@@ -241,13 +236,6 @@
m_string = value;
}
-void IDBAny::set(int64_t value)
-{
- ASSERT(m_type == UndefinedType);
- m_type = IntegerType;
- m_integer = value;
-}
-
} // namespace WebCore
#endif
« no previous file with comments | « Source/WebCore/Modules/indexeddb/IDBAny.h ('k') | Source/WebCore/Modules/indexeddb/IDBCursor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698