Chromium Code Reviews| Index: Source/core/css/FontFaceSet.h |
| diff --git a/Source/core/css/FontFaceSet.h b/Source/core/css/FontFaceSet.h |
| index 774afab34cc87d24a602be1d7463598fed938b7f..55a2a5afd95ac89acc2075f09cb4ad08880f679a 100644 |
| --- a/Source/core/css/FontFaceSet.h |
| +++ b/Source/core/css/FontFaceSet.h |
| @@ -58,9 +58,8 @@ class FontsReadyPromiseResolver; |
| class ExecutionContext; |
| #if ENABLE(OILPAN) |
| -class FontFaceSet FINAL : public RefCountedGarbageCollected<FontFaceSet>, public HeapSupplement<Document>, public ActiveDOMObject, public EventTargetWithInlineData { |
| +class FontFaceSet FINAL : public GarbageCollectedFinalized<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 { |
| @@ -115,7 +114,11 @@ public: |
| private: |
| static PassRefPtrWillBeRawPtr<FontFaceSet> create(Document& document) |
| { |
| - return adoptRefWillBeRefCountedGarbageCollected<FontFaceSet>(new FontFaceSet(document)); |
| +#if ENABLE(OILPAN) |
| + return new FontFaceSet(document); |
|
tkent
2014/06/12 05:04:55
Use adoptRefWillBeNoop
haraken
2014/06/12 05:59:16
Done.
|
| +#else |
| + return adoptRef(new FontFaceSet(document)); |
| +#endif |
| } |
| class FontLoadHistogram { |