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

Side by Side Diff: Source/core/css/CSSFontFace.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, 9 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/core/css/CSSCustomFontData.h ('k') | Source/core/css/CSSFontFace.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) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 void setSegmentedFontFace(CSSSegmentedFontFace*); 62 void setSegmentedFontFace(CSSSegmentedFontFace*);
63 void clearSegmentedFontFace() { m_segmentedFontFace = 0; } 63 void clearSegmentedFontFace() { m_segmentedFontFace = 0; }
64 64
65 bool isValid() const { return !m_sources.isEmpty(); } 65 bool isValid() const { return !m_sources.isEmpty(); }
66 66
67 void addSource(PassOwnPtr<CSSFontFaceSource>); 67 void addSource(PassOwnPtr<CSSFontFaceSource>);
68 68
69 void beginLoadIfNeeded(CSSFontFaceSource*, CSSFontSelector* = 0); 69 void beginLoadIfNeeded(CSSFontFaceSource*, CSSFontSelector* = 0);
70 void fontLoaded(CSSFontFaceSource*); 70 void fontLoaded(CSSFontFaceSource*);
71 void fontLoadWaitLimitExceeded(CSSFontFaceSource*);
71 72
72 PassRefPtr<SimpleFontData> getFontData(const FontDescription&); 73 PassRefPtr<SimpleFontData> getFontData(const FontDescription&);
73 74
74 struct UnicodeRange { 75 struct UnicodeRange {
75 UnicodeRange(UChar32 from, UChar32 to) 76 UnicodeRange(UChar32 from, UChar32 to)
76 : m_from(from) 77 : m_from(from)
77 , m_to(to) 78 , m_to(to)
78 { 79 {
79 } 80 }
80 81
(...skipping 28 matching lines...) Expand all
109 110
110 UnicodeRangeSet m_ranges; 111 UnicodeRangeSet m_ranges;
111 CSSSegmentedFontFace* m_segmentedFontFace; 112 CSSSegmentedFontFace* m_segmentedFontFace;
112 Deque<OwnPtr<CSSFontFaceSource> > m_sources; 113 Deque<OwnPtr<CSSFontFaceSource> > m_sources;
113 FontFace* m_fontFace; 114 FontFace* m_fontFace;
114 }; 115 };
115 116
116 } 117 }
117 118
118 #endif 119 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSCustomFontData.h ('k') | Source/core/css/CSSFontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698