| Index: Source/modules/indexeddb/IDBObjectStore.h
|
| diff --git a/Source/modules/indexeddb/IDBObjectStore.h b/Source/modules/indexeddb/IDBObjectStore.h
|
| index 6c8851c572b22346f4f4f72e3afd0a26526fe3a7..003f93fd0e0250a81a6d417c0b85882997bb9fa6 100644
|
| --- a/Source/modules/indexeddb/IDBObjectStore.h
|
| +++ b/Source/modules/indexeddb/IDBObjectStore.h
|
| @@ -63,15 +63,8 @@ public:
|
| PassRefPtr<IDBTransaction> transaction() const { return m_transaction; }
|
| bool autoIncrement() const { return m_metadata.autoIncrement; }
|
|
|
| - PassRefPtr<IDBRequest> add(ScriptState*, ScriptValue&, ExceptionCode&);
|
| - PassRefPtr<IDBRequest> put(ScriptState*, ScriptValue&, ExceptionCode&);
|
| - PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, ExceptionCode& ec) { return openCursor(context, static_cast<IDBKeyRange*>(0), ec); }
|
| - PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec) { return openCursor(context, keyRange, IDBCursor::directionNext(), ec); }
|
| - PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, const ScriptValue& key, ExceptionCode& ec) { return openCursor(context, key, IDBCursor::directionNext(), ec); }
|
| 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*, PassRefPtr<IDBKeyRange>, const String& direction, IDBDatabaseBackendInterface::TaskType, ExceptionCode&);
|
| 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&);
|
| @@ -82,18 +75,15 @@ public:
|
|
|
| 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> 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<IDBIndex> index(const String& name, ExceptionCode&);
|
| void deleteIndex(const String& name, ExceptionCode&);
|
|
|
| - PassRefPtr<IDBRequest> count(ScriptExecutionContext* context, ExceptionCode& ec) { return count(context, static_cast<IDBKeyRange*>(0), ec); }
|
| PassRefPtr<IDBRequest> count(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&);
|
| PassRefPtr<IDBRequest> count(ScriptExecutionContext*, const ScriptValue& key, ExceptionCode&);
|
|
|
| - PassRefPtr<IDBRequest> put(IDBDatabaseBackendInterface::PutMode, PassRefPtr<IDBAny> source, ScriptState*, ScriptValue&, const ScriptValue& key, ExceptionCode&);
|
| + // Used by IDBCursor::update():
|
| PassRefPtr<IDBRequest> put(IDBDatabaseBackendInterface::PutMode, PassRefPtr<IDBAny> source, ScriptState*, ScriptValue&, PassRefPtr<IDBKey>, ExceptionCode&);
|
| +
|
| void markDeleted() { m_deleted = true; }
|
| void transactionFinished();
|
|
|
| @@ -108,6 +98,11 @@ public:
|
| private:
|
| IDBObjectStore(const IDBObjectStoreMetadata&, IDBTransaction*);
|
|
|
| + PassRefPtr<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&);
|
| +
|
| int64_t findIndexId(const String& name) const;
|
| bool containsIndex(const String& name) const
|
| {
|
|
|