Simplify Supplementables post Oilpan.

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

 /*
  * 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 16 matching lines @@
 #define FontFaceSet_h
 
 #include "bindings/core/v8/Iterable.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "core/css/FontFace.h"
 #include "core/dom/ActiveDOMObject.h"
 #include "core/dom/Document.h"
 #include "core/events/EventListener.h"
 #include "core/events/EventTarget.h"
 #include "platform/AsyncMethodRunner.h"
-#include "platform/RefCountedSupplement.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Allocator.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 
 // Mac OS X 10.6 SDK defines check() macro that interfares with our check() method
 #ifdef check
 #undef check
 #endif
 
 namespace blink {
 
 class CSSFontFace;
 class CSSFontFaceSource;
 class CSSFontSelector;
 class Dictionary;
 class ExceptionState;
 class Font;
 class FontFaceCache;
 class FontResource;
 class ExecutionContext;
 
 using FontFaceSetIterable = PairIterable<Member<FontFace>, Member<FontFace>>;
 
-#if ENABLE(OILPAN)
-class FontFaceSet final : public EventTargetWithInlineData, public HeapSupplement<Document>, public ActiveDOMObject, public FontFaceSetIterable {
+class FontFaceSet final : public EventTargetWithInlineData, public Supplement<Document>, public ActiveDOMObject, public FontFaceSetIterable {
     USING_GARBAGE_COLLECTED_MIXIN(FontFaceSet);
-    using SupplementType = HeapSupplement<Document>;
-#else
-class FontFaceSet final : public EventTargetWithInlineData, public RefCountedSupplement<Document, FontFaceSet>, public ActiveDOMObject, public FontFaceSetIterable {
-    REFCOUNTED_EVENT_TARGET(FontFaceSet);
-    using SupplementType = RefCountedSupplement<Document, FontFaceSet>;
-#endif
     DEFINE_WRAPPERTYPEINFO();
 public:
     ~FontFaceSet() override;
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loading);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loadingdone);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loadingerror);
 
     bool check(const String& font, const String& text, ExceptionState&);
     ScriptPromise load(ScriptState*, const String& font, const String& text);
@@ skipping 95 matching lines @@
     HeapListHashSet<Member<FontFace>> m_nonCSSConnectedFaces;
 
     Member<AsyncMethodRunner<FontFaceSet>> m_asyncRunner;
 
     FontLoadHistogram m_histogram;
 };
 
 } // namespace blink
 
 #endif // FontFaceSet_h