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

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

Issue 2717123003: RemoteFontFaceSource should keep FontCustomPlatformData over FontResource revalidation (Closed)
Patch Set: test description 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/RemoteFontFaceSource.h
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
index beb46b50ff2b0a8ee826b47501fe6314f3699819..c068907b66ca4efd6a08fa4d42642b80fd863089 100644
--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
@@ -12,6 +12,7 @@
namespace blink {
class CSSFontSelector;
+class FontCustomPlatformData;
enum FontDisplay {
FontDisplayAuto,
@@ -88,7 +89,7 @@ class RemoteFontFaceSource final : public CSSFontFaceSource,
bool loadError,
bool isInterventionTriggered);
void longLimitExceeded(bool isInterventionTriggered);
- void recordFallbackTime(const FontResource*);
+ void recordFallbackTime();
void recordRemoteFont(const FontResource*, bool isInterventionTriggered);
bool hadBlankText() { return m_blankPaintTime; }
DataSource dataSource() { return m_dataSource; }
@@ -112,8 +113,14 @@ class RemoteFontFaceSource final : public CSSFontFaceSource,
bool shouldTriggerWebFontsIntervention();
bool isLowPriorityLoadingAllowedForRemoteFont() const override;
+ // Cleared once load is finished.
Member<FontResource> m_font;
+
Member<CSSFontSelector> m_fontSelector;
+
+ // |nullptr| if font is not loaded or failed to decode.
+ RefPtr<FontCustomPlatformData> m_customFontData;
+
const FontDisplay m_display;
DisplayPeriod m_period;
FontLoadHistograms m_histograms;

Powered by Google App Engine
This is Rietveld 408576698