Index: Source/modules/indexeddb/IDBObjectStore.h |
diff --git a/Source/modules/indexeddb/IDBObjectStore.h b/Source/modules/indexeddb/IDBObjectStore.h |
index a4e8d3eec4f5b0bd5a7f26a277170ab9516c65d8..dd24409c8e37697cbaf91a70999fd49f101f2451 100644 |
--- a/Source/modules/indexeddb/IDBObjectStore.h |
+++ b/Source/modules/indexeddb/IDBObjectStore.h |
@@ -64,13 +64,10 @@ public: |
PassRefPtr<IDBTransaction> transaction() const { return m_transaction; } |
bool autoIncrement() const { return m_metadata.autoIncrement; } |
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> range, const String& direction, ExceptionState& es) { return openCursor(context, range, direction, IDBDatabaseBackendInterface::NormalTask, es); } |
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const ScriptValue& key, const String& direction, ExceptionState&); |
+ PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const ScriptValue& range, const String& direction, ExceptionState&); |
PassRefPtr<IDBRequest> get(ScriptExecutionContext*, const ScriptValue& key, ExceptionState&); |
- PassRefPtr<IDBRequest> get(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionState&); |
PassRefPtr<IDBRequest> add(ScriptState*, ScriptValue&, const ScriptValue& key, ExceptionState&); |
PassRefPtr<IDBRequest> put(ScriptState*, ScriptValue&, const ScriptValue& key, ExceptionState&); |
- PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionState&); |
PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, const ScriptValue& key, ExceptionState&); |
PassRefPtr<IDBRequest> clear(ScriptExecutionContext*, ExceptionState&); |
@@ -79,12 +76,14 @@ public: |
PassRefPtr<IDBIndex> index(const String& name, ExceptionState&); |
void deleteIndex(const String& name, ExceptionState&); |
- PassRefPtr<IDBRequest> count(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionState&); |
- PassRefPtr<IDBRequest> count(ScriptExecutionContext*, const ScriptValue& key, ExceptionState&); |
+ PassRefPtr<IDBRequest> count(ScriptExecutionContext*, const ScriptValue& range, ExceptionState&); |
// Used by IDBCursor::update(): |
PassRefPtr<IDBRequest> put(IDBDatabaseBackendInterface::PutMode, PassRefPtr<IDBAny> source, ScriptState*, ScriptValue&, PassRefPtr<IDBKey>, ExceptionState&); |
+ // Used internally and by InspectorIndexedDBAgent: |
+ PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, IndexedDB::CursorDirection, IDBDatabaseBackendInterface::TaskType = IDBDatabaseBackendInterface::NormalTask); |
+ |
void markDeleted() { m_deleted = true; } |
bool isDeleted() const { return m_deleted; } |
void transactionFinished(); |
@@ -100,7 +99,6 @@ public: |
private: |
IDBObjectStore(const IDBObjectStoreMetadata&, IDBTransaction*); |
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, IDBDatabaseBackendInterface::TaskType, ExceptionState&); |
PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, const Dictionary&, ExceptionState&); |
PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, bool unique, bool multiEntry, ExceptionState&); |
PassRefPtr<IDBRequest> put(IDBDatabaseBackendInterface::PutMode, PassRefPtr<IDBAny> source, ScriptState*, ScriptValue&, const ScriptValue& key, ExceptionState&); |