diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/storage/IDBCursor.h | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/storage/IDBCursor.h')
-rw-r--r-- | Source/WebCore/storage/IDBCursor.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Source/WebCore/storage/IDBCursor.h b/Source/WebCore/storage/IDBCursor.h index 9f5ffad..9ade9c8 100644 --- a/Source/WebCore/storage/IDBCursor.h +++ b/Source/WebCore/storage/IDBCursor.h @@ -29,6 +29,7 @@ #if ENABLE(INDEXED_DATABASE) #include "ExceptionCode.h" +#include "IDBKey.h" #include <wtf/PassRefPtr.h> #include <wtf/RefCounted.h> #include <wtf/RefPtr.h> @@ -38,7 +39,6 @@ namespace WebCore { class IDBAny; class IDBCallbacks; class IDBCursorBackendInterface; -class IDBKey; class IDBRequest; class IDBTransaction; class ScriptExecutionContext; @@ -52,11 +52,8 @@ public: PREV = 2, PREV_NO_DUPLICATE = 3, }; - static PassRefPtr<IDBCursor> create(PassRefPtr<IDBCursorBackendInterface> backend, IDBRequest* request, IDBTransaction* transaction) - { - return adoptRef(new IDBCursor(backend, request, transaction)); - } - ~IDBCursor(); + static PassRefPtr<IDBCursor> create(PassRefPtr<IDBCursorBackendInterface>, IDBRequest*, IDBAny* source, IDBTransaction*); + virtual ~IDBCursor(); // FIXME: Try to modify the code generator so this is unneeded. void continueFunction(ExceptionCode& ec) { continueFunction(0, ec); } @@ -64,16 +61,21 @@ public: // Implement the IDL unsigned short direction() const; PassRefPtr<IDBKey> key() const; - PassRefPtr<IDBAny> value() const; + PassRefPtr<IDBKey> primaryKey() const; + PassRefPtr<SerializedScriptValue> value() const; + IDBAny* source() const; + PassRefPtr<IDBRequest> update(ScriptExecutionContext*, PassRefPtr<SerializedScriptValue>, ExceptionCode&); void continueFunction(PassRefPtr<IDBKey>, ExceptionCode&); PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, ExceptionCode&); -private: - explicit IDBCursor(PassRefPtr<IDBCursorBackendInterface>, IDBRequest*, IDBTransaction*); +protected: + IDBCursor(PassRefPtr<IDBCursorBackendInterface>, IDBRequest*, IDBAny* source, IDBTransaction*); +private: RefPtr<IDBCursorBackendInterface> m_backend; RefPtr<IDBRequest> m_request; + RefPtr<IDBAny> m_source; RefPtr<IDBTransaction> m_transaction; }; |