Index: Source/modules/indexeddb/IDBObjectStore.h |
diff --git a/Source/modules/indexeddb/IDBObjectStore.h b/Source/modules/indexeddb/IDBObjectStore.h |
index 2a2627f2cabb0cd8636db0a1abdc9bddb339bc84..e99002baa0777568a6e522e01a2578737f698882 100644 |
--- a/Source/modules/indexeddb/IDBObjectStore.h |
+++ b/Source/modules/indexeddb/IDBObjectStore.h |
@@ -63,26 +63,26 @@ 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, ExceptionCode& ec) { return openCursor(context, range, direction, IDBDatabaseBackendInterface::NormalTask, ec); } |
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const ScriptValue& key, const String& direction, ExceptionCode&); |
- PassRefPtr<IDBRequest> get(ScriptExecutionContext*, const ScriptValue& key, ExceptionCode&); |
- PassRefPtr<IDBRequest> get(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&); |
- PassRefPtr<IDBRequest> add(ScriptState*, ScriptValue&, const ScriptValue& key, ExceptionCode&); |
- PassRefPtr<IDBRequest> put(ScriptState*, ScriptValue&, const ScriptValue& key, ExceptionCode&); |
- PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&); |
- PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, const ScriptValue& key, ExceptionCode&); |
- PassRefPtr<IDBRequest> clear(ScriptExecutionContext*, ExceptionCode&); |
+ IDBRequest* openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> range, const String& direction, ExceptionCode& ec) { return openCursor(context, range, direction, IDBDatabaseBackendInterface::NormalTask, ec); } |
+ IDBRequest* openCursor(ScriptExecutionContext*, const ScriptValue& key, const String& direction, ExceptionCode&); |
+ IDBRequest* get(ScriptExecutionContext*, const ScriptValue& key, ExceptionCode&); |
+ IDBRequest* get(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&); |
+ IDBRequest* add(ScriptState*, ScriptValue&, const ScriptValue& key, ExceptionCode&); |
+ IDBRequest* put(ScriptState*, ScriptValue&, const ScriptValue& key, ExceptionCode&); |
+ IDBRequest* deleteFunction(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&); |
+ IDBRequest* deleteFunction(ScriptExecutionContext*, const ScriptValue& key, ExceptionCode&); |
+ IDBRequest* clear(ScriptExecutionContext*, ExceptionCode&); |
PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext* context, const String& name, const String& keyPath, const Dictionary& options, ExceptionCode& ec) { return createIndex(context, name, IDBKeyPath(keyPath), options, ec); } |
PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext* context, const String& name, const Vector<String>& keyPath, const Dictionary& options, ExceptionCode& ec) { return createIndex(context, name, IDBKeyPath(keyPath), options, ec); } |
PassRefPtr<IDBIndex> index(const String& name, ExceptionCode&); |
void deleteIndex(const String& name, ExceptionCode&); |
- PassRefPtr<IDBRequest> count(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&); |
- PassRefPtr<IDBRequest> count(ScriptExecutionContext*, const ScriptValue& key, ExceptionCode&); |
+ IDBRequest* count(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&); |
+ IDBRequest* count(ScriptExecutionContext*, const ScriptValue& key, ExceptionCode&); |
// Used by IDBCursor::update(): |
- PassRefPtr<IDBRequest> put(IDBDatabaseBackendInterface::PutMode, PassRefPtr<IDBAny> source, ScriptState*, ScriptValue&, PassRefPtr<IDBKey>, ExceptionCode&); |
+ IDBRequest* put(IDBDatabaseBackendInterface::PutMode, PassRefPtr<IDBAny> source, ScriptState*, ScriptValue&, PassRefPtr<IDBKey>, ExceptionCode&); |
void markDeleted() { m_deleted = true; } |
bool isDeleted() const { return m_deleted; } |
@@ -99,10 +99,10 @@ public: |
private: |
IDBObjectStore(const IDBObjectStoreMetadata&, IDBTransaction*); |
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, IDBDatabaseBackendInterface::TaskType, ExceptionCode&); |
+ IDBRequest* openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, IDBDatabaseBackendInterface::TaskType, ExceptionCode&); |
PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, const Dictionary&, ExceptionCode&); |
PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, bool unique, bool multiEntry, ExceptionCode&); |
- PassRefPtr<IDBRequest> put(IDBDatabaseBackendInterface::PutMode, PassRefPtr<IDBAny> source, ScriptState*, ScriptValue&, const ScriptValue& key, ExceptionCode&); |
+ IDBRequest* put(IDBDatabaseBackendInterface::PutMode, PassRefPtr<IDBAny> source, ScriptState*, ScriptValue&, const ScriptValue& key, ExceptionCode&); |
int64_t findIndexId(const String& name) const; |
bool containsIndex(const String& name) const |