| Index: third_party/WebKit/Source/modules/indexeddb/IDBRequest.h
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBRequest.h b/third_party/WebKit/Source/modules/indexeddb/IDBRequest.h
|
| index c294a6692317708f0201662968419227582e6e85..1b5514338df875f4336497cb8715fa9282fc802e 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBRequest.h
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBRequest.h
|
| @@ -31,7 +31,7 @@
|
|
|
| #include "bindings/core/v8/ScriptState.h"
|
| #include "bindings/core/v8/ScriptValue.h"
|
| -#include "core/dom/ActiveDOMObject.h"
|
| +#include "core/dom/ContextLifecycleObserver.h"
|
| #include "core/dom/DOMStringList.h"
|
| #include "core/events/EventListener.h"
|
| #include "core/events/EventTarget.h"
|
| @@ -56,7 +56,7 @@ class IDBValue;
|
|
|
| class MODULES_EXPORT IDBRequest
|
| : public RefCountedGarbageCollectedEventTargetWithInlineData<IDBRequest>
|
| - , public ActiveDOMObject {
|
| + , public ContextLifecycleObserver {
|
| REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(IDBRequest);
|
| DEFINE_WRAPPERTYPEINFO();
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(IDBRequest);
|
| @@ -109,9 +109,8 @@ public:
|
| virtual void onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBDatabase>, const IDBDatabaseMetadata&, WebIDBDataLoss, String dataLossMessage) { ASSERT_NOT_REACHED(); }
|
| virtual void onSuccess(PassOwnPtr<WebIDBDatabase>, const IDBDatabaseMetadata&) { ASSERT_NOT_REACHED(); }
|
|
|
| - // ActiveDOMObject
|
| bool hasPendingActivity() const final;
|
| - void stop() final;
|
| + void contextDestroyed() final;
|
|
|
| // EventTarget
|
| const AtomicString& interfaceName() const override;
|
| @@ -136,7 +135,6 @@ protected:
|
| // EventTarget
|
| DispatchEventResult dispatchEventInternal(PassRefPtrWillBeRawPtr<Event>) override;
|
|
|
| - bool m_contextStopped = false;
|
| Member<IDBTransaction> m_transaction;
|
| ReadyState m_readyState = PENDING;
|
| bool m_requestAborted = false; // May be aborted by transaction then receive async onsuccess; ignore vs. assert.
|
|
|