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

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

Issue 1313853003: CSS Font Loading: FontFaceSet.ready should return the same promise each time (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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
Index: Source/core/css/FontFaceSet.h
diff --git a/Source/core/css/FontFaceSet.h b/Source/core/css/FontFaceSet.h
index ec969bf5e0a564d990c14a773e4039f85949441a..13ca9c6658650081ec4cde065908e0481cdf0263 100644
--- a/Source/core/css/FontFaceSet.h
+++ b/Source/core/css/FontFaceSet.h
@@ -55,7 +55,6 @@ class ExceptionState;
class Font;
class FontFaceCache;
class FontResource;
-class FontsReadyPromiseResolver;
class ExecutionContext;
#if ENABLE(OILPAN)
@@ -145,11 +144,14 @@ private:
void handlePendingEventsAndPromises();
const WillBeHeapListHashSet<RefPtrWillBeMember<FontFace>>& cssConnectedFontFaceList() const;
bool isCSSConnectedFontFace(FontFace*) const;
+ bool shouldSignalReady() const;
+
+ typedef ScriptPromiseProperty<RawPtrWillBeMember<FontFaceSet>, RawPtrWillBeMember<FontFaceSet>, Member<DOMException>> ReadyProperty;
WillBeHeapHashSet<RefPtrWillBeMember<FontFace>> m_loadingFonts;
bool m_shouldFireLoadingEvent;
bool m_isLoading;
- PersistentHeapVectorWillBeHeapVector<Member<FontsReadyPromiseResolver>> m_readyResolvers;
+ PersistentWillBeMember<ReadyProperty> m_ready;
FontFaceArray m_loadedFonts;
FontFaceArray m_failedFonts;
WillBeHeapListHashSet<RefPtrWillBeMember<FontFace>> m_nonCSSConnectedFaces;

Powered by Google App Engine
This is Rietveld 408576698