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

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

Issue 2620293002: Remove CSSFontSelector argument and member from CSSSegmentedFontFace (Closed)
Patch Set: Update test for CL comments Created 3 years, 10 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: third_party/WebKit/Source/core/css/CSSFontFace.h
diff --git a/third_party/WebKit/Source/core/css/CSSFontFace.h b/third_party/WebKit/Source/core/css/CSSFontFace.h
index 8d217faa73d6c46b1b4d6412aaa6cb7890038af5..afec0181af9d050e7e2ba8623cf7d5fd7bfe6c35 100644
--- a/third_party/WebKit/Source/core/css/CSSFontFace.h
+++ b/third_party/WebKit/Source/core/css/CSSFontFace.h
@@ -68,7 +68,8 @@ class CORE_EXPORT CSSFontFace final
void addSource(CSSFontFaceSource*);
void didBeginLoad();
- void fontLoaded(RemoteFontFaceSource*);
+ // Document is required in case the status was an error.
+ void fontLoaded(RemoteFontFaceSource*, Document*);
void didBecomeVisibleFallback(RemoteFontFaceSource*);
PassRefPtr<SimpleFontData> getFontData(const FontDescription&);
@@ -76,10 +77,12 @@ class CORE_EXPORT CSSFontFace final
FontFace::LoadStatusType loadStatus() const {
return m_fontFace->loadStatus();
}
- bool maybeLoadFont(const FontDescription&, const String&);
- bool maybeLoadFont(const FontDescription&, const FontDataForRangeSet&);
- void load();
- void load(const FontDescription&);
+ bool maybeLoadFont(Document*, const FontDescription&, const String&);
+ bool maybeLoadFont(Document*,
+ const FontDescription&,
+ const FontDataForRangeSet&);
+ void load(Document*);
+ void load(Document*, const FontDescription&);
bool hadBlankText() { return isValid() && m_sources.first()->hadBlankText(); }

Powered by Google App Engine
This is Rietveld 408576698