Simplify Supplementables post Oilpan.

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 478 matching lines @@
     }
 }
 
 static const char* supplementName()
 {
     return "FontFaceSet";
 }
 
 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();
 }
 
 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();
 }
 
 FontFaceSetIterable::IterationSource* FontFaceSet::startIteration(ScriptState*, ExceptionState&)
 {
     // Setlike should iterate each item in insertion order, and items should
     // be keep on up to date. But since blink does not have a way to hook up CSS
     // modification, take a snapshot here, and make it ordered as follows.
     HeapVector<Member<FontFace>> fontFaces;
     if (inActiveDocumentContext()) {
@@ skipping 10 matching lines @@
 bool FontFaceSet::IterationSource::next(ScriptState*, Member<FontFace>& key, Member<FontFace>& value, ExceptionState&)
 {
     if (m_fontFaces.size() <= m_index)
         return false;
     key = value = m_fontFaces[m_index++];
     return true;
 }
 
 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);
 }
 
 } // namespace blink