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

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

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
Index: third_party/WebKit/Source/core/css/CSSFontFace.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSFontFace.cpp b/third_party/WebKit/Source/core/css/CSSFontFace.cpp
index c7e1664d3a879b089a5fd5ba929e42b2d91288e0..234e0426724ee3a7a454719682cb4d1e1fdd4e6a 100644
--- a/third_party/WebKit/Source/core/css/CSSFontFace.cpp
+++ b/third_party/WebKit/Source/core/css/CSSFontFace.cpp
@@ -189,22 +189,8 @@ void CSSFontFace::setLoadStatus(FontFace::LoadStatusType newStatus)
if (!m_segmentedFontFace)
return;
Document* document = m_segmentedFontFace->fontSelector()->document();
- if (!document)
- return;
-
- switch (newStatus) {
- case FontFace::Loading:
+ if (document && newStatus == FontFace::Loading)
FontFaceSet::from(*document)->beginFontLoading(m_fontFace);
- break;
- case FontFace::Loaded:
- FontFaceSet::from(*document)->fontLoaded(m_fontFace);
- break;
- case FontFace::Error:
- FontFaceSet::from(*document)->loadError(m_fontFace);
- break;
- default:
- break;
- }
}
DEFINE_TRACE(CSSFontFace)

Powered by Google App Engine
This is Rietveld 408576698