Simplify Supplementables post Oilpan.

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

Index: third_party/WebKit/Source/core/dom/Document.cpp
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index a29d9edc4c7badcc8230e5143ff79686a51cc977..ccec7e59829f595b92d54d33d414a130dd8281cb 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -5956,7 +5956,6 @@ LayoutViewItem Document::layoutViewItem() const
 
 DEFINE_TRACE(Document)
 {
-#if ENABLE(OILPAN)
     visitor->trace(m_importsController);
     visitor->trace(m_docType);
     visitor->trace(m_implementation);
@@ -6012,8 +6011,7 @@ DEFINE_TRACE(Document)
     visitor->trace(m_canvasFontCache);
     visitor->trace(m_intersectionObserverController);
     visitor->trace(m_intersectionObserverData);
-    HeapSupplementable<Document>::trace(visitor);
-#endif
+    Supplementable<Document>::trace(visitor);
     TreeScope::trace(visitor);
     ContainerNode::trace(visitor);
     ExecutionContext::trace(visitor);
@@ -6021,7 +6019,7 @@ DEFINE_TRACE(Document)
     SecurityContext::trace(visitor);
 }
 
-template class CORE_TEMPLATE_EXPORT HeapSupplement<Document>;
+template class CORE_TEMPLATE_EXPORT Supplement<Document>;
 
 } // namespace blink