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

Unified Diff: Source/web/ContextFeaturesClientImpl.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/platform/blink_platform.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/ContextFeaturesClientImpl.cpp
diff --git a/Source/web/ContextFeaturesClientImpl.cpp b/Source/web/ContextFeaturesClientImpl.cpp
index 0852b11f24c7f150e5cdafaf21fa6a9dfdaa538b..e0375c2755427d2e463255e719961f5517a76956 100644
--- a/Source/web/ContextFeaturesClientImpl.cpp
+++ b/Source/web/ContextFeaturesClientImpl.cpp
@@ -39,7 +39,7 @@
namespace blink {
-class ContextFeaturesCache final : public NoBaseWillBeGarbageCollectedFinalized<ContextFeaturesCache>, public DocumentSupplement {
+class ContextFeaturesCache final : public NoBaseWillBeGarbageCollectedFinalized<ContextFeaturesCache>, public WillBeHeapSupplement<Document> {
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ContextFeaturesCache);
public:
class Entry {
@@ -91,7 +91,7 @@ public:
DEFINE_INLINE_VIRTUAL_TRACE()
{
- DocumentSupplement::trace(visitor);
+ WillBeHeapSupplement<Document>::trace(visitor);
}
private:
@@ -106,10 +106,10 @@ const char* ContextFeaturesCache::supplementName()
ContextFeaturesCache& ContextFeaturesCache::from(Document& document)
{
- ContextFeaturesCache* cache = static_cast<ContextFeaturesCache*>(DocumentSupplement::from(document, supplementName()));
+ ContextFeaturesCache* cache = static_cast<ContextFeaturesCache*>(WillBeHeapSupplement<Document>::from(document, supplementName()));
if (!cache) {
cache = new ContextFeaturesCache();
- DocumentSupplement::provideTo(document, supplementName(), adoptPtrWillBeNoop(cache));
+ WillBeHeapSupplement<Document>::provideTo(document, supplementName(), adoptPtrWillBeNoop(cache));
}
return *cache;
« no previous file with comments | « Source/platform/blink_platform.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698