Simplify Supplementables post Oilpan.

third_party/WebKit/Source/core/dom/Document.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
@@ skipping 194 matching lines @@
     XHTMLDocumentClass = 1 << 1,
     ImageDocumentClass = 1 << 2,
     PluginDocumentClass = 1 << 3,
     MediaDocumentClass = 1 << 4,
     SVGDocumentClass = 1 << 5,
     XMLDocumentClass = 1 << 6,
 };
 
 using DocumentClassFlags = unsigned char;
 
-class CORE_EXPORT Document : public ContainerNode, public TreeScope, public SecurityContext, public ExecutionContext
-    , public HeapSupplementable<Document>, public DocumentLifecycleNotifier {
+class CORE_EXPORT Document : public ContainerNode, public TreeScope, public SecurityContext, public ExecutionContext, public Supplementable<Document>, public DocumentLifecycleNotifier {
     DEFINE_WRAPPERTYPEINFO();
     USING_GARBAGE_COLLECTED_MIXIN(Document);
 public:
     static RawPtr<Document> create(const DocumentInit& initializer = DocumentInit())
     {
         return new Document(initializer);
     }
     ~Document() override;
 
     MediaQueryMatcher& mediaQueryMatcher();
@@ skipping 1171 matching lines @@
     ClientHintsPreferences m_clientHintsPreferences;
 
     Member<CanvasFontCache> m_canvasFontCache;
 
     Member<IntersectionObserverController> m_intersectionObserverController;
     Member<NodeIntersectionObserverData> m_intersectionObserverData;
 
     int m_nodeCount;
 };
 
-extern template class CORE_EXTERN_TEMPLATE_EXPORT HeapSupplement<Document>;
+extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Document>;
 
 inline bool Document::shouldOverrideLegacyDescription(ViewportDescription::Type origin)
 {
     // The different (legacy) meta tags have different priorities based on the type
     // regardless of which order they appear in the DOM. The priority is given by the
     // ViewportDescription::Type enum.
     return origin >= m_legacyViewportDescription.type;
 }
 
 inline void Document::scheduleLayoutTreeUpdateIfNeeded()
@@ skipping 26 matching lines @@
 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 CORE_EXPORT void showLiveDocumentInstances();
 #endif
 
 #endif // Document_h