Fix FontFaceSet state getting stuck at loading

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 39 matching lines @@
 class CSSFontSelector;
 class Dictionary;
 class ExceptionState;
 class Font;
 class FontFaceCache;
 class FontResource;
 class ExecutionContext;
 
 using FontFaceSetIterable = PairIterable<Member<FontFace>, Member<FontFace>>;
 
-class FontFaceSet final : public EventTargetWithInlineData, public Supplement<Document>, public ActiveDOMObject, public FontFaceSetIterable {
+class FontFaceSet final : public EventTargetWithInlineData, public Supplement<Document>, public ActiveDOMObject, public FontFaceSetIterable, public FontFace::LoadFontCallback {
     USING_GARBAGE_COLLECTED_MIXIN(FontFaceSet);
     DEFINE_WRAPPERTYPEINFO();
     WTF_MAKE_NONCOPYABLE(FontFaceSet);
 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);
     ScriptPromise ready(ScriptState*);
 
     FontFaceSet* addForBinding(ScriptState*, FontFace*, ExceptionState&);
     void clearForBinding(ScriptState*, ExceptionState&);
     bool deleteForBinding(ScriptState*, FontFace*, ExceptionState&);
     bool hasForBinding(ScriptState*, FontFace*, ExceptionState&) const;
 
     size_t size() const;
     AtomicString status() const;
 
     ExecutionContext* getExecutionContext() const override;
     const AtomicString& interfaceName() const override;
 
     Document* document() const;
 
     void didLayout();
     void beginFontLoading(FontFace*);
-    void fontLoaded(FontFace*);
-    void loadError(FontFace*);
+
+    // FontFace::LoadFontCallback
+    void notifyLoaded(FontFace*) override;
+    void notifyError(FontFace*) override;
 
     size_t approximateBlankCharacterCount() const;
 
     // ActiveDOMObject
     void suspend() override;
     void resume() override;
     void stop() override;
 
     static FontFaceSet* from(Document&);
     static void didLayout(Document&);
@@ skipping 74 matching lines @@
     HeapListHashSet<Member<FontFace>> m_nonCSSConnectedFaces;
 
     Member<AsyncMethodRunner<FontFaceSet>> m_asyncRunner;
 
     FontLoadHistogram m_histogram;
 };
 
 } // namespace blink
 
 #endif // FontFaceSet_h