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

Unified Diff: Source/platform/fonts/Font.cpp

Issue 171823002: Make text visible when font loading takes longer than 3 seconds (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 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
« no previous file with comments | « Source/platform/fonts/Font.h ('k') | Source/platform/fonts/FontData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/Font.cpp
diff --git a/Source/platform/fonts/Font.cpp b/Source/platform/fonts/Font.cpp
index 03bcf14f77afc0846a860bcdd7bb81673a4dbf3d..168b13cbb34c5839c64ff171a6cce569daa41baa 100644
--- a/Source/platform/fonts/Font.cpp
+++ b/Source/platform/fonts/Font.cpp
@@ -107,7 +107,7 @@ void Font::drawText(GraphicsContext* context, const TextRunPaintInfo& runInfo, c
// Don't draw anything while we are using custom fonts that are in the process of loading,
// except if the 'force' argument is set to true (in which case it will use a fallback
// font).
- if (loadingCustomFonts() && customFontNotReadyAction == DoNotPaintIfFontNotReady)
+ if (shouldSkipDrawing() && customFontNotReadyAction == DoNotPaintIfFontNotReady)
return;
CodePath codePathToUse = codePath(runInfo.run);
@@ -123,7 +123,7 @@ void Font::drawText(GraphicsContext* context, const TextRunPaintInfo& runInfo, c
void Font::drawEmphasisMarks(GraphicsContext* context, const TextRunPaintInfo& runInfo, const AtomicString& mark, const FloatPoint& point) const
{
- if (loadingCustomFonts())
+ if (shouldSkipDrawing())
return;
CodePath codePathToUse = codePath(runInfo.run);
« no previous file with comments | « Source/platform/fonts/Font.h ('k') | Source/platform/fonts/FontData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698