diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/storage/IDBTransactionBackendImpl.h | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/storage/IDBTransactionBackendImpl.h')
-rw-r--r-- | Source/WebCore/storage/IDBTransactionBackendImpl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/storage/IDBTransactionBackendImpl.h b/Source/WebCore/storage/IDBTransactionBackendImpl.h index f4dfaa8..1297e74 100644 --- a/Source/WebCore/storage/IDBTransactionBackendImpl.h +++ b/Source/WebCore/storage/IDBTransactionBackendImpl.h @@ -42,7 +42,7 @@ class IDBDatabaseBackendImpl; class IDBTransactionBackendImpl : public IDBTransactionBackendInterface { public: - static PassRefPtr<IDBTransactionBackendImpl> create(DOMStringList* objectStores, unsigned short mode, unsigned long timeout, IDBDatabaseBackendImpl*); + static PassRefPtr<IDBTransactionBackendImpl> create(DOMStringList* objectStores, unsigned short mode, IDBDatabaseBackendImpl*); virtual ~IDBTransactionBackendImpl(); virtual PassRefPtr<IDBObjectStoreBackendInterface> objectStore(const String& name, ExceptionCode&); @@ -55,7 +55,7 @@ public: void run(); private: - IDBTransactionBackendImpl(DOMStringList* objectStores, unsigned short mode, unsigned long timeout, IDBDatabaseBackendImpl*); + IDBTransactionBackendImpl(DOMStringList* objectStores, unsigned short mode, IDBDatabaseBackendImpl*); enum State { Unused, // Created, but no tasks yet. @@ -72,7 +72,6 @@ private: RefPtr<DOMStringList> m_objectStoreNames; unsigned short m_mode; - unsigned long m_timeout; State m_state; RefPtr<IDBTransactionCallbacks> m_callbacks; |