| Index: third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h
|
| diff --git a/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h b/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h
|
| index 1acc6d828ed32b1b5855ef0a01cca3978f2a6f0c..6d5b415425140f71d91c222cb81b371d89292604 100644
|
| --- a/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h
|
| +++ b/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef WaitUntilObserver_h
|
| #define WaitUntilObserver_h
|
|
|
| -#include "core/dom/ContextLifecycleObserver.h"
|
| #include "modules/ModulesExport.h"
|
| #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
|
| #include "platform/Timer.h"
|
| @@ -21,10 +20,7 @@ class ScriptValue;
|
|
|
| // Created for each ExtendableEvent instance.
|
| class MODULES_EXPORT WaitUntilObserver final
|
| - : public GarbageCollectedFinalized<WaitUntilObserver>,
|
| - public ContextLifecycleObserver {
|
| - USING_GARBAGE_COLLECTED_MIXIN(WaitUntilObserver);
|
| -
|
| + : public GarbageCollectedFinalized<WaitUntilObserver> {
|
| public:
|
| enum EventType {
|
| Activate,
|
| @@ -68,6 +64,7 @@ class MODULES_EXPORT WaitUntilObserver final
|
|
|
| void consumeWindowInteraction(TimerBase*);
|
|
|
| + Member<ExecutionContext> m_executionContext;
|
| EventType m_type;
|
| int m_eventID;
|
| int m_pendingActivity = 0;
|
|
|