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/IDBCursor.cpp | |
| 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/IDBCursor.cpp')
| -rw-r--r-- | Source/WebCore/storage/IDBCursor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/storage/IDBCursor.cpp b/Source/WebCore/storage/IDBCursor.cpp index 444c109..531cae1 100644 --- a/Source/WebCore/storage/IDBCursor.cpp +++ b/Source/WebCore/storage/IDBCursor.cpp @@ -33,13 +33,13 @@ #include "IDBCursorBackendInterface.h" #include "IDBKey.h" #include "IDBRequest.h" -#include "IDBTransactionBackendInterface.h" +#include "IDBTransaction.h" #include "ScriptExecutionContext.h" #include "SerializedScriptValue.h" namespace WebCore { -IDBCursor::IDBCursor(PassRefPtr<IDBCursorBackendInterface> backend, IDBRequest* request, IDBTransactionBackendInterface* transaction) +IDBCursor::IDBCursor(PassRefPtr<IDBCursorBackendInterface> backend, IDBRequest* request, IDBTransaction* transaction) : m_backend(backend) , m_request(request) , m_transaction(transaction) @@ -84,7 +84,7 @@ void IDBCursor::continueFunction(PassRefPtr<IDBKey> key, ExceptionCode& ec) if (m_request->resetReadyState(m_transaction.get())) m_backend->continueFunction(key, m_request, ec); else - ASSERT_NOT_REACHED(); + ec = IDBDatabaseException::NOT_ALLOWED_ERR; } PassRefPtr<IDBRequest> IDBCursor::deleteFunction(ScriptExecutionContext* context, ExceptionCode& ec) |