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

Unified Diff: Source/modules/serviceworkers/ServiceWorkerContainerClient.h

Issue 1060813005: Componentization: fix SupplementTracing<0>::~SupplementTracing<0>(void) already defined. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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: Source/modules/serviceworkers/ServiceWorkerContainerClient.h
diff --git a/Source/modules/serviceworkers/ServiceWorkerContainerClient.h b/Source/modules/serviceworkers/ServiceWorkerContainerClient.h
index 00d93c44e17746f2faf8a82ee537b952b1974620..1c351c12035d6f2d670cf3f5a08b159f6db6faa6 100644
--- a/Source/modules/serviceworkers/ServiceWorkerContainerClient.h
+++ b/Source/modules/serviceworkers/ServiceWorkerContainerClient.h
@@ -5,7 +5,7 @@
#ifndef ServiceWorkerContainerClient_h
#define ServiceWorkerContainerClient_h
-#include "core/dom/DocumentSupplementable.h"
+#include "core/dom/Document.h"
#include "core/workers/WorkerClients.h"
#include "wtf/Forward.h"
@@ -18,7 +18,7 @@ class WebServiceWorkerProvider;
// Owned by Document (or WorkerClients).
class ServiceWorkerContainerClient final
: public NoBaseWillBeGarbageCollectedFinalized<ServiceWorkerContainerClient>
- , public DocumentSupplement
+ , public WillBeHeapSupplement<Document>
, public WillBeHeapSupplement<WorkerClients> {
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerContainerClient);
WTF_MAKE_NONCOPYABLE(ServiceWorkerContainerClient);
@@ -33,7 +33,7 @@ public:
DEFINE_INLINE_VIRTUAL_TRACE()
{
- DocumentSupplement::trace(visitor);
+ WillBeHeapSupplement<Document>::trace(visitor);
WillBeHeapSupplement<WorkerClients>::trace(visitor);
}
« no previous file with comments | « Source/modules/quota/StorageQuotaClient.h ('k') | Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698