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

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

Issue 196383035: Fix promise resolution of FontFaceSet#load() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: naming Created 6 years, 9 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 | « Source/bindings/v8/V8Binding.h ('k') | Source/core/css/CSSSegmentedFontFace.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSSegmentedFontFace.h
diff --git a/Source/core/css/CSSSegmentedFontFace.h b/Source/core/css/CSSSegmentedFontFace.h
index 18b49c6c2ae4ba5a623c261384c04180c6c206b5..119f709fc456d087cb4c6d86a8bceff187ef7ebb 100644
--- a/Source/core/css/CSSSegmentedFontFace.h
+++ b/Source/core/css/CSSSegmentedFontFace.h
@@ -63,15 +63,8 @@ public:
PassRefPtr<FontData> getFontData(const FontDescription&);
- class LoadFontCallback : public RefCounted<LoadFontCallback> {
- public:
- virtual ~LoadFontCallback() { }
- virtual void notifyLoaded(CSSSegmentedFontFace*) = 0;
- virtual void notifyError(CSSSegmentedFontFace*) = 0;
- };
-
bool checkFont(const String&) const;
- void loadFont(const FontDescription&, const String&, PassRefPtr<LoadFontCallback>);
+ void match(const String&, Vector<RefPtr<FontFace> >&) const;
void willUseFontData(const FontDescription&);
private:
@@ -90,7 +83,6 @@ private:
// All non-CSS-connected FontFaces are stored after the CSS-connected ones.
FontFaceList m_fontFaces;
FontFaceList::iterator m_firstNonCssConnectedFace;
- Vector<RefPtr<LoadFontCallback> > m_callbacks;
};
} // namespace WebCore
« no previous file with comments | « Source/bindings/v8/V8Binding.h ('k') | Source/core/css/CSSSegmentedFontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698