Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: third_party/WebKit/Source/core/css/FontFaceSet.h

Issue 2340273002: Fix FontFaceSet state getting stuck at loading (Closed)
Patch Set: Separate test case Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.cpp ('k') | third_party/WebKit/Source/core/css/FontFaceSet.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/FontFaceSet.h
diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.h b/third_party/WebKit/Source/core/css/FontFaceSet.h
index 34a0122a8dbdc653d3011ab50ce1b356c11ac953..e55c5d9481b5626f58abf6b43603030e6d903b78 100644
--- a/third_party/WebKit/Source/core/css/FontFaceSet.h
+++ b/third_party/WebKit/Source/core/css/FontFaceSet.h
@@ -57,7 +57,7 @@ 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);
@@ -87,8 +87,10 @@ public:
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;
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.cpp ('k') | third_party/WebKit/Source/core/css/FontFaceSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698