| Index: Source/core/css/FontFaceSet.h
|
| diff --git a/Source/core/css/FontFaceSet.h b/Source/core/css/FontFaceSet.h
|
| index babeb2d96fac697ede54afd622b20e8ee6d55142..108eb4a92a4bd0a0ab91f5e50a2a0684e1742364 100644
|
| --- a/Source/core/css/FontFaceSet.h
|
| +++ b/Source/core/css/FontFaceSet.h
|
| @@ -58,11 +58,11 @@ class FontsReadyPromiseResolver;
|
| class ExecutionContext;
|
|
|
| #if ENABLE(OILPAN)
|
| -class FontFaceSet FINAL : public GarbageCollectedFinalized<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);
|
| typedef HeapSupplement<Document> SupplementType;
|
| #else
|
| -class FontFaceSet FINAL : public RefCountedSupplement<Document, FontFaceSet>, public ActiveDOMObject, public EventTargetWithInlineData {
|
| +class FontFaceSet final : public RefCountedSupplement<Document, FontFaceSet>, public ActiveDOMObject, public EventTargetWithInlineData {
|
| DEFINE_EVENT_TARGET_REFCOUNTING(RefCounted<FontFaceSet>);
|
| typedef RefCountedSupplement<Document, FontFaceSet> SupplementType;
|
| #endif
|
| @@ -88,8 +88,8 @@ public:
|
| unsigned long size() const;
|
| AtomicString status() const;
|
|
|
| - virtual ExecutionContext* executionContext() const OVERRIDE;
|
| - virtual const AtomicString& interfaceName() const OVERRIDE;
|
| + virtual ExecutionContext* executionContext() const override;
|
| + virtual const AtomicString& interfaceName() const override;
|
|
|
| Document* document() const;
|
|
|
| @@ -99,9 +99,9 @@ public:
|
| void loadError(FontFace*);
|
|
|
| // ActiveDOMObject
|
| - virtual void suspend() OVERRIDE;
|
| - virtual void resume() OVERRIDE;
|
| - virtual void stop() OVERRIDE;
|
| + virtual void suspend() override;
|
| + virtual void resume() override;
|
| + virtual void stop() override;
|
|
|
| static PassRefPtrWillBeRawPtr<FontFaceSet> from(Document&);
|
| static void didLayout(Document&);
|
| @@ -109,7 +109,7 @@ public:
|
| void addFontFacesToFontFaceCache(FontFaceCache*, CSSFontSelector*);
|
|
|
| #if ENABLE(OILPAN)
|
| - virtual void trace(Visitor*) OVERRIDE;
|
| + virtual void trace(Visitor*) override;
|
| #endif
|
|
|
| private:
|
|
|