| Index: third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| index 7af6ab2ac40451df5f4f09c2608dd22bb2fe12dc..b94796bd74571ce91e5ae4bd03e53c65ef4cd527 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| @@ -74,10 +74,10 @@ ScriptValue IDBObjectStore::keyPath(ScriptState* scriptState) const
|
| return ScriptValue::from(scriptState, m_metadata.keyPath);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<DOMStringList> IDBObjectStore::indexNames() const
|
| +RawPtr<DOMStringList> IDBObjectStore::indexNames() const
|
| {
|
| IDB_TRACE("IDBObjectStore::indexNames");
|
| - RefPtrWillBeRawPtr<DOMStringList> indexNames = DOMStringList::create(DOMStringList::IndexedDB);
|
| + RawPtr<DOMStringList> indexNames = DOMStringList::create(DOMStringList::IndexedDB);
|
| for (const auto& it : m_metadata.indexes)
|
| indexNames->append(it.value.name);
|
| indexNames->sort();
|
| @@ -415,9 +415,9 @@ namespace {
|
| // cursor success handlers are kept alive.
|
| class IndexPopulator final : public EventListener {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<IndexPopulator> create(ScriptState* scriptState, IDBDatabase* database, int64_t transactionId, int64_t objectStoreId, const IDBIndexMetadata& indexMetadata)
|
| + static RawPtr<IndexPopulator> create(ScriptState* scriptState, IDBDatabase* database, int64_t transactionId, int64_t objectStoreId, const IDBIndexMetadata& indexMetadata)
|
| {
|
| - return adoptRefWillBeNoop(new IndexPopulator(scriptState, database, transactionId, objectStoreId, indexMetadata));
|
| + return (new IndexPopulator(scriptState, database, transactionId, objectStoreId, indexMetadata));
|
| }
|
|
|
| bool operator==(const EventListener& other) const override
|
| @@ -482,7 +482,7 @@ private:
|
| }
|
|
|
| RefPtr<ScriptState> m_scriptState;
|
| - PersistentWillBeMember<IDBDatabase> m_database;
|
| + Member<IDBDatabase> m_database;
|
| const int64_t m_transactionId;
|
| const int64_t m_objectStoreId;
|
| const IDBIndexMetadata m_indexMetadata;
|
| @@ -545,7 +545,7 @@ IDBIndex* IDBObjectStore::createIndex(ScriptState* scriptState, const String& na
|
| indexRequest->preventPropagation();
|
|
|
| // This is kept alive by being the success handler of the request, which is in turn kept alive by the owning transaction.
|
| - RefPtrWillBeRawPtr<IndexPopulator> indexPopulator = IndexPopulator::create(scriptState, transaction()->db(), m_transaction->id(), id(), metadata);
|
| + RawPtr<IndexPopulator> indexPopulator = IndexPopulator::create(scriptState, transaction()->db(), m_transaction->id(), id(), metadata);
|
| indexRequest->setOnsuccess(indexPopulator);
|
| return index;
|
| }
|
|
|