Simplify Supplementables post Oilpan.

third_party/WebKit/Source/core/css/FontFaceSet.cpp

Index: third_party/WebKit/Source/core/css/FontFaceSet.cpp
diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
index e013efcc7ee2594a4cdee2efe241941fbb1de2d9..63d430fd3271e48ea959a2e5d2dffa153c289661 100644
--- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp
+++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
@@ -496,10 +496,10 @@ static const char* supplementName()
 
 RawPtr<FontFaceSet> FontFaceSet::from(Document& document)
 {
-    RawPtr<FontFaceSet> fonts = static_cast<FontFaceSet*>(SupplementType::from(document, supplementName()));
+    RawPtr<FontFaceSet> fonts = static_cast<FontFaceSet*>(Supplement<Document>::from(document, supplementName()));
     if (!fonts) {
         fonts = FontFaceSet::create(document);
-        SupplementType::provideTo(document, supplementName(), fonts);
+        Supplement<Document>::provideTo(document, supplementName(), fonts);
     }
 
     return fonts.release();
@@ -507,7 +507,7 @@ RawPtr<FontFaceSet> FontFaceSet::from(Document& document)
 
 void FontFaceSet::didLayout(Document& document)
 {
-    if (FontFaceSet* fonts = static_cast<FontFaceSet*>(SupplementType::from(document, supplementName())))
+    if (FontFaceSet* fonts = static_cast<FontFaceSet*>(Supplement<Document>::from(document, supplementName())))
         fonts->didLayout();
 }
 
@@ -538,16 +538,14 @@ bool FontFaceSet::IterationSource::next(ScriptState*, Member<FontFace>& key, Mem
 
 DEFINE_TRACE(FontFaceSet)
 {
-#if ENABLE(OILPAN)
     visitor->trace(m_ready);
     visitor->trace(m_loadingFonts);
     visitor->trace(m_loadedFonts);
     visitor->trace(m_failedFonts);
     visitor->trace(m_nonCSSConnectedFaces);
     visitor->trace(m_asyncRunner);
-    HeapSupplement<Document>::trace(visitor);
-#endif
     EventTargetWithInlineData::trace(visitor);
+    Supplement<Document>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }