| Index: third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h b/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h
|
| index 7c75a91d620e4e15d2b3b629783d4cbf7bcec458..d589d36a322e31d4c25217244d8d632c1b7945fe 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h
|
| @@ -59,7 +59,7 @@ class MODULES_EXPORT IDBDatabase final
|
| , public ActiveScriptWrappable
|
| , public ActiveDOMObject {
|
| REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(IDBDatabase);
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(IDBDatabase);
|
| + USING_GARBAGE_COLLECTED_MIXIN(IDBDatabase);
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| static IDBDatabase* create(ExecutionContext*, PassOwnPtr<WebIDBDatabase>, IDBDatabaseCallbacks*);
|
| @@ -75,7 +75,7 @@ public:
|
| // Implement the IDL
|
| const String& name() const { return m_metadata.name; }
|
| unsigned long long version() const { return m_metadata.version; }
|
| - PassRefPtrWillBeRawPtr<DOMStringList> objectStoreNames() const;
|
| + RawPtr<DOMStringList> objectStoreNames() const;
|
|
|
| IDBObjectStore* createObjectStore(const String& name, const IDBObjectStoreParameters& options, ExceptionState& exceptionState) { return createObjectStore(name, IDBKeyPath(options.keyPath()), options.autoIncrement(), exceptionState); }
|
| IDBTransaction* transaction(ScriptState*, const StringOrStringSequenceOrDOMStringList&, const String& mode, ExceptionState&);
|
| @@ -105,7 +105,7 @@ public:
|
| bool isClosePending() const { return m_closePending; }
|
| void forceClose();
|
| const IDBDatabaseMetadata& metadata() const { return m_metadata; }
|
| - void enqueueEvent(PassRefPtrWillBeRawPtr<Event>);
|
| + void enqueueEvent(RawPtr<Event>);
|
|
|
| int64_t findObjectStoreId(const String& name) const;
|
| bool containsObjectStore(const String& name) const
|
| @@ -138,7 +138,7 @@ public:
|
|
|
| protected:
|
| // EventTarget
|
| - DispatchEventResult dispatchEventInternal(PassRefPtrWillBeRawPtr<Event>) override;
|
| + DispatchEventResult dispatchEventInternal(RawPtr<Event>) override;
|
|
|
| private:
|
| IDBDatabase(ExecutionContext*, PassOwnPtr<WebIDBDatabase>, IDBDatabaseCallbacks*);
|
| @@ -156,7 +156,7 @@ private:
|
|
|
| // Keep track of the versionchange events waiting to be fired on this
|
| // database so that we can cancel them if the database closes.
|
| - WillBeHeapVector<RefPtrWillBeMember<Event>> m_enqueuedEvents;
|
| + HeapVector<Member<Event>> m_enqueuedEvents;
|
|
|
| Member<IDBDatabaseCallbacks> m_databaseCallbacks;
|
| };
|
|
|