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

Side by Side Diff: Source/platform/fonts/Font.h

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/platform/fonts/CustomFontData.h ('k') | Source/platform/fonts/Font.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Holger Hans Peter Freyther 6 * Copyright (C) 2008 Holger Hans Peter Freyther
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 FontFallbackList* fontList() const { return m_fontFallbackList.get(); } 168 FontFallbackList* fontList() const { return m_fontFallbackList.get(); }
169 169
170 void willUseFontData() const; 170 void willUseFontData() const;
171 171
172 private: 172 private:
173 bool loadingCustomFonts() const 173 bool loadingCustomFonts() const
174 { 174 {
175 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); 175 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
176 } 176 }
177 177
178 bool shouldSkipDrawing() const
179 {
180 return m_fontFallbackList && m_fontFallbackList->shouldSkipDrawing();
181 }
182
178 FontDescription m_fontDescription; 183 FontDescription m_fontDescription;
179 mutable RefPtr<FontFallbackList> m_fontFallbackList; 184 mutable RefPtr<FontFallbackList> m_fontFallbackList;
180 }; 185 };
181 186
182 inline Font::~Font() 187 inline Font::~Font()
183 { 188 {
184 } 189 }
185 190
186 inline const SimpleFontData* Font::primaryFont() const 191 inline const SimpleFontData* Font::primaryFont() const
187 { 192 {
(...skipping 22 matching lines...) Expand all
210 { 215 {
211 if (!tabSize) 216 if (!tabSize)
212 return fontDescription().letterSpacing(); 217 return fontDescription().letterSpacing();
213 float tabWidth = tabSize * fontData.spaceWidth() + fontDescription().letterS pacing(); 218 float tabWidth = tabSize * fontData.spaceWidth() + fontDescription().letterS pacing();
214 return tabWidth - fmodf(position, tabWidth); 219 return tabWidth - fmodf(position, tabWidth);
215 } 220 }
216 221
217 } 222 }
218 223
219 #endif 224 #endif
OLDNEW
« no previous file with comments | « Source/platform/fonts/CustomFontData.h ('k') | Source/platform/fonts/Font.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698