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

Unified Diff: Source/core/html/imports/HTMLImportsController.cpp

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
« no previous file with comments | « Source/core/html/imports/HTMLImportsController.h ('k') | Source/core/loader/PrerendererClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/imports/HTMLImportsController.cpp
diff --git a/Source/core/html/imports/HTMLImportsController.cpp b/Source/core/html/imports/HTMLImportsController.cpp
index d2c0999637872b6b2e7d78f45dc06483f766fd7c..766347a99a271e42bfd892ea4262ec34dd9c7eef 100644
--- a/Source/core/html/imports/HTMLImportsController.cpp
+++ b/Source/core/html/imports/HTMLImportsController.cpp
@@ -51,7 +51,7 @@ void HTMLImportsController::provideTo(Document& master)
{
OwnPtrWillBeRawPtr<HTMLImportsController> controller = adoptPtrWillBeNoop(new HTMLImportsController(master));
master.setImportsController(controller.get());
- DocumentSupplement::provideTo(master, supplementName(), controller.release());
+ WillBeHeapSupplement<Document>::provideTo(master, supplementName(), controller.release());
}
void HTMLImportsController::removeFrom(Document& master)
@@ -59,7 +59,7 @@ void HTMLImportsController::removeFrom(Document& master)
HTMLImportsController* controller = master.importsController();
ASSERT(controller);
controller->dispose();
- static_cast<DocumentSupplementable&>(master).removeSupplement(supplementName());
+ static_cast<WillBeHeapSupplementable<Document>&>(master).removeSupplement(supplementName());
master.setImportsController(nullptr);
}
@@ -180,7 +180,7 @@ DEFINE_TRACE(HTMLImportsController)
{
visitor->trace(m_root);
visitor->trace(m_loaders);
- DocumentSupplement::trace(visitor);
+ WillBeHeapSupplement<Document>::trace(visitor);
}
} // namespace blink
« no previous file with comments | « Source/core/html/imports/HTMLImportsController.h ('k') | Source/core/loader/PrerendererClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698