| Index: Source/modules/indexeddb/IDBRequest.cpp
|
| diff --git a/Source/modules/indexeddb/IDBRequest.cpp b/Source/modules/indexeddb/IDBRequest.cpp
|
| index 751f888b50be1b40d86eceae2f1c96fb33390534..07bc48ab4cd27a47e59d6b039639198cf22c6885 100644
|
| --- a/Source/modules/indexeddb/IDBRequest.cpp
|
| +++ b/Source/modules/indexeddb/IDBRequest.cpp
|
| @@ -66,7 +66,7 @@ IDBRequest::IDBRequest(ScriptState* scriptState, IDBAny* source, IDBTransaction*
|
| , m_source(source)
|
| , m_hasPendingActivity(true)
|
| , m_cursorType(IndexedDB::CursorKeyAndValue)
|
| - , m_cursorDirection(blink::WebIDBCursorDirectionNext)
|
| + , m_cursorDirection(WebIDBCursorDirectionNext)
|
| , m_pendingCursor(nullptr)
|
| , m_didFireUpgradeNeededEvent(false)
|
| , m_preventPropagation(false)
|
| @@ -159,7 +159,7 @@ void IDBRequest::abort()
|
| m_requestAborted = true;
|
| }
|
|
|
| -void IDBRequest::setCursorDetails(IndexedDB::CursorType cursorType, blink::WebIDBCursorDirection direction)
|
| +void IDBRequest::setCursorDetails(IndexedDB::CursorType cursorType, WebIDBCursorDirection direction)
|
| {
|
| ASSERT(m_readyState == PENDING);
|
| ASSERT(!m_pendingCursor);
|
| @@ -194,7 +194,7 @@ IDBCursor* IDBRequest::getResultCursor() const
|
| return 0;
|
| }
|
|
|
| -void IDBRequest::setResultCursor(IDBCursor* cursor, IDBKey* key, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<blink::WebBlobInfo> > blobInfo)
|
| +void IDBRequest::setResultCursor(IDBCursor* cursor, IDBKey* key, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<WebBlobInfo> > blobInfo)
|
| {
|
| ASSERT(m_readyState == PENDING);
|
| m_cursorKey = key;
|
| @@ -250,7 +250,7 @@ void IDBRequest::onSuccess(const Vector<String>& stringList)
|
| onSuccessInternal(IDBAny::create(domStringList.release()));
|
| }
|
|
|
| -void IDBRequest::onSuccess(PassOwnPtr<blink::WebIDBCursor> backend, IDBKey* key, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<blink::WebBlobInfo> > blobInfo)
|
| +void IDBRequest::onSuccess(PassOwnPtr<WebIDBCursor> backend, IDBKey* key, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<WebBlobInfo> > blobInfo)
|
| {
|
| IDB_TRACE("IDBRequest::onSuccess(IDBCursor)");
|
| if (!shouldEnqueueEvent())
|
| @@ -283,7 +283,7 @@ void IDBRequest::onSuccess(IDBKey* idbKey)
|
| onSuccessInternal(IDBAny::createUndefined());
|
| }
|
|
|
| -void IDBRequest::onSuccess(PassRefPtr<SharedBuffer> valueBuffer, PassOwnPtr<Vector<blink::WebBlobInfo> > blobInfo)
|
| +void IDBRequest::onSuccess(PassRefPtr<SharedBuffer> valueBuffer, PassOwnPtr<Vector<WebBlobInfo> > blobInfo)
|
| {
|
| IDB_TRACE("IDBRequest::onSuccess(SharedBuffer)");
|
| if (!shouldEnqueueEvent())
|
| @@ -315,7 +315,7 @@ static IDBObjectStore* effectiveObjectStore(IDBAny* source)
|
| }
|
| #endif
|
|
|
| -void IDBRequest::onSuccess(PassRefPtr<SharedBuffer> prpValueBuffer, PassOwnPtr<Vector<blink::WebBlobInfo> > blobInfo, IDBKey* prpPrimaryKey, const IDBKeyPath& keyPath)
|
| +void IDBRequest::onSuccess(PassRefPtr<SharedBuffer> prpValueBuffer, PassOwnPtr<Vector<WebBlobInfo> > blobInfo, IDBKey* prpPrimaryKey, const IDBKeyPath& keyPath)
|
| {
|
| IDB_TRACE("IDBRequest::onSuccess(SharedBuffer, IDBKey, IDBKeyPath)");
|
| if (!shouldEnqueueEvent())
|
| @@ -365,7 +365,7 @@ void IDBRequest::setResult(IDBAny* result)
|
| m_resultDirty = true;
|
| }
|
|
|
| -void IDBRequest::onSuccess(IDBKey* key, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<blink::WebBlobInfo> > blobInfo)
|
| +void IDBRequest::onSuccess(IDBKey* key, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<WebBlobInfo> > blobInfo)
|
| {
|
| IDB_TRACE("IDBRequest::onSuccess(key, primaryKey, value)");
|
| if (!shouldEnqueueEvent())
|
|
|