Oilpan: Move all supplements of Page, Document, and WorkerClients to the managed heap.

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 39 matching lines @@
 class CSSFontSelector;
 class Dictionary;
 class Document;
 class ExceptionState;
 class Font;
 class FontFaceCache;
 class FontResource;
 class FontsReadyPromiseResolver;
 class ExecutionContext;
 
-// FIXME: Oilpan: Make this RefCountedGarbageCollected<FontFaceCache> and HeapSupplement<Document> once all document supplements are moved to the managed heap.
-class FontFaceSet FINAL : public RefCountedSupplementWillBeRefCountedGarbageCollectedSupplement<Document, FontFaceSet>, public ActiveDOMObject, public EventTargetWithInlineData {
-    DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<FontFaceSet>);
+#if ENABLE(OILPAN)
+class FontFaceSet FINAL : public RefCountedGarbageCollected<FontFaceSet>, public HeapSupplement<Document>, public ActiveDOMObject, public EventTargetWithInlineData {
+    USING_GARBAGE_COLLECTED_MIXIN(FontFaceSet);
+    DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedGarbageCollected<FontFaceSet>);
+    typedef HeapSupplement<Document> SupplementType;
+#else
+class FontFaceSet FINAL : public RefCountedSupplement<Document, FontFaceSet>, public ActiveDOMObject, public EventTargetWithInlineData {
+    DEFINE_EVENT_TARGET_REFCOUNTING(RefCounted<FontFaceSet>);
+    typedef RefCountedSupplement<Document, FontFaceSet> SupplementType;
+#endif
 public:
     virtual ~FontFaceSet();
 
     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(const String& font, const String& text);
     ScriptPromise ready();
@@ skipping 26 matching lines @@
     static PassRefPtrWillBeRawPtr<FontFaceSet> from(Document&);
     static void didLayout(Document&);
 
     void addFontFacesToFontFaceCache(FontFaceCache*, CSSFontSelector*);
 
 #if ENABLE(OILPAN)
     virtual void trace(Visitor*) OVERRIDE;
 #endif
 
 private:
-    typedef RefCountedSupplementWillBeRefCountedGarbageCollectedSupplement<Document, FontFaceSet> SupplementType;
-
     static PassRefPtrWillBeRawPtr<FontFaceSet> create(Document& document)
     {
         return adoptRefWillBeRefCountedGarbageCollected<FontFaceSet>(new FontFaceSet(document));
     }
 
     class FontLoadHistogram {
     public:
         enum Status { NoWebFonts, HadBlankText, DidNotHaveBlankText, Reported };
         FontLoadHistogram() : m_status(NoWebFonts), m_count(0), m_recorded(false) { }
         void incrementCount() { m_count++; }
@@ skipping 31 matching lines @@
     ListHashSet<RefPtrWillBeMember<FontFace> > m_nonCSSConnectedFaces;
 
     AsyncMethodRunner<FontFaceSet> m_asyncRunner;
 
     FontLoadHistogram m_histogram;
 };
 
 } // namespace WebCore
 
 #endif // FontFaceSet_h