Index: Source/modules/indexeddb/IDBIndex.cpp |
diff --git a/Source/modules/indexeddb/IDBIndex.cpp b/Source/modules/indexeddb/IDBIndex.cpp |
index 8cd48ce516929ac62a4dc575d7e194d1d34828ed..c35ad862f12cc47e2dc22df85b78b786f5a453e1 100644 |
--- a/Source/modules/indexeddb/IDBIndex.cpp |
+++ b/Source/modules/indexeddb/IDBIndex.cpp |
@@ -55,7 +55,7 @@ IDBIndex::~IDBIndex() |
{ |
} |
-PassRefPtr<IDBRequest> IDBIndex::openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, const String& directionString, ExceptionCode& ec) |
+IDBRequest* IDBIndex::openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, const String& directionString, ExceptionCode& ec) |
{ |
IDB_TRACE("IDBIndex::openCursor"); |
if (isDeleted()) { |
@@ -70,13 +70,13 @@ PassRefPtr<IDBRequest> IDBIndex::openCursor(ScriptExecutionContext* context, Pas |
if (ec) |
return 0; |
- RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get()); |
+ IDBRequest* request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get()); |
request->setCursorDetails(IndexedDB::CursorKeyAndValue, direction); |
backendDB()->openCursor(m_transaction->id(), m_objectStore->id(), m_metadata.id, keyRange, direction, false, IDBDatabaseBackendInterface::NormalTask, request); |
return request; |
} |
-PassRefPtr<IDBRequest> IDBIndex::openCursor(ScriptExecutionContext* context, const ScriptValue& key, const String& direction, ExceptionCode& ec) |
+IDBRequest* IDBIndex::openCursor(ScriptExecutionContext* context, const ScriptValue& key, const String& direction, ExceptionCode& ec) |
{ |
IDB_TRACE("IDBIndex::openCursor"); |
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec); |
@@ -85,7 +85,7 @@ PassRefPtr<IDBRequest> IDBIndex::openCursor(ScriptExecutionContext* context, con |
return openCursor(context, keyRange.release(), direction, ec); |
} |
-PassRefPtr<IDBRequest> IDBIndex::count(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec) |
+IDBRequest* IDBIndex::count(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec) |
{ |
IDB_TRACE("IDBIndex::count"); |
if (isDeleted()) { |
@@ -96,12 +96,12 @@ PassRefPtr<IDBRequest> IDBIndex::count(ScriptExecutionContext* context, PassRefP |
ec = IDBDatabaseException::TransactionInactiveError; |
return 0; |
} |
- RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get()); |
+ IDBRequest* request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get()); |
backendDB()->count(m_transaction->id(), m_objectStore->id(), m_metadata.id, keyRange, request); |
return request; |
} |
-PassRefPtr<IDBRequest> IDBIndex::count(ScriptExecutionContext* context, const ScriptValue& key, ExceptionCode& ec) |
+IDBRequest* IDBIndex::count(ScriptExecutionContext* context, const ScriptValue& key, ExceptionCode& ec) |
{ |
IDB_TRACE("IDBIndex::count"); |
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec); |
@@ -110,7 +110,7 @@ PassRefPtr<IDBRequest> IDBIndex::count(ScriptExecutionContext* context, const Sc |
return count(context, keyRange.release(), ec); |
} |
-PassRefPtr<IDBRequest> IDBIndex::openKeyCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, const String& directionString, ExceptionCode& ec) |
+IDBRequest* IDBIndex::openKeyCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, const String& directionString, ExceptionCode& ec) |
{ |
IDB_TRACE("IDBIndex::openKeyCursor"); |
if (isDeleted()) { |
@@ -125,13 +125,13 @@ PassRefPtr<IDBRequest> IDBIndex::openKeyCursor(ScriptExecutionContext* context, |
if (ec) |
return 0; |
- RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get()); |
+ IDBRequest* request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get()); |
request->setCursorDetails(IndexedDB::CursorKeyOnly, direction); |
backendDB()->openCursor(m_transaction->id(), m_objectStore->id(), m_metadata.id, keyRange, direction, true, IDBDatabaseBackendInterface::NormalTask, request); |
return request; |
} |
-PassRefPtr<IDBRequest> IDBIndex::openKeyCursor(ScriptExecutionContext* context, const ScriptValue& key, const String& direction, ExceptionCode& ec) |
+IDBRequest* IDBIndex::openKeyCursor(ScriptExecutionContext* context, const ScriptValue& key, const String& direction, ExceptionCode& ec) |
{ |
IDB_TRACE("IDBIndex::openKeyCursor"); |
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec); |
@@ -140,7 +140,7 @@ PassRefPtr<IDBRequest> IDBIndex::openKeyCursor(ScriptExecutionContext* context, |
return openKeyCursor(context, keyRange.release(), direction, ec); |
} |
-PassRefPtr<IDBRequest> IDBIndex::get(ScriptExecutionContext* context, const ScriptValue& key, ExceptionCode& ec) |
+IDBRequest* IDBIndex::get(ScriptExecutionContext* context, const ScriptValue& key, ExceptionCode& ec) |
{ |
IDB_TRACE("IDBIndex::get"); |
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec); |
@@ -149,7 +149,7 @@ PassRefPtr<IDBRequest> IDBIndex::get(ScriptExecutionContext* context, const Scri |
return get(context, keyRange.release(), ec); |
} |
-PassRefPtr<IDBRequest> IDBIndex::get(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec) |
+IDBRequest* IDBIndex::get(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec) |
{ |
IDB_TRACE("IDBIndex::get"); |
if (isDeleted()) { |
@@ -165,12 +165,12 @@ PassRefPtr<IDBRequest> IDBIndex::get(ScriptExecutionContext* context, PassRefPtr |
return 0; |
} |
- RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get()); |
+ IDBRequest* request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get()); |
backendDB()->get(m_transaction->id(), m_objectStore->id(), m_metadata.id, keyRange, false, request); |
return request; |
} |
-PassRefPtr<IDBRequest> IDBIndex::getKey(ScriptExecutionContext* context, const ScriptValue& key, ExceptionCode& ec) |
+IDBRequest* IDBIndex::getKey(ScriptExecutionContext* context, const ScriptValue& key, ExceptionCode& ec) |
{ |
IDB_TRACE("IDBIndex::getKey"); |
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec); |
@@ -180,7 +180,7 @@ PassRefPtr<IDBRequest> IDBIndex::getKey(ScriptExecutionContext* context, const S |
return getKey(context, keyRange.release(), ec); |
} |
-PassRefPtr<IDBRequest> IDBIndex::getKey(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec) |
+IDBRequest* IDBIndex::getKey(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec) |
{ |
IDB_TRACE("IDBIndex::getKey"); |
if (isDeleted()) { |
@@ -196,7 +196,7 @@ PassRefPtr<IDBRequest> IDBIndex::getKey(ScriptExecutionContext* context, PassRef |
return 0; |
} |
- RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get()); |
+ IDBRequest* request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get()); |
backendDB()->get(m_transaction->id(), m_objectStore->id(), m_metadata.id, keyRange, true, request); |
return request; |
} |