Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1185)

Unified Diff: third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h

Issue 2138003002: Remove DOMWindowProperty::willDetachGlobalObjectFromFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
diff --git a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
index ebcb21b8d280358e8827a9e698b49034d63ab95e..9d8584e731c76b9c9313dac76f24b1e63c9da323 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
+++ b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
@@ -5,6 +5,7 @@
#ifndef NavigatorServiceWorker_h
#define NavigatorServiceWorker_h
+#include "core/dom/ContextLifecycleObserver.h"
#include "core/frame/Navigator.h"
#include "modules/ModulesExport.h"
#include "platform/Supplementable.h"
@@ -17,7 +18,7 @@ class ExceptionState;
class Navigator;
class ServiceWorkerContainer;
-class MODULES_EXPORT NavigatorServiceWorker final : public GarbageCollected<NavigatorServiceWorker>, public Supplement<Navigator>, public DOMWindowProperty {
+class MODULES_EXPORT NavigatorServiceWorker final : public GarbageCollected<NavigatorServiceWorker>, public Supplement<Navigator>, public ContextLifecycleObserver {
USING_GARBAGE_COLLECTED_MIXIN(NavigatorServiceWorker);
public:
static NavigatorServiceWorker* from(Document&);
@@ -29,12 +30,12 @@ public:
private:
explicit NavigatorServiceWorker(Navigator&);
- ServiceWorkerContainer* serviceWorker(ExceptionState&);
+ ServiceWorkerContainer* serviceWorker(LocalFrame*, ExceptionState&);
static const char* supplementName();
- // DOMWindowProperty override.
- void willDetachGlobalObjectFromFrame() override;
+ // ContextLifecycleObserver override.
+ void contextDestroyed() override;
Member<ServiceWorkerContainer> m_serviceWorker;
};

Powered by Google App Engine
This is Rietveld 408576698