OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2011 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 } | 56 } |
57 | 57 |
58 void CSSFontFace::fontLoaded(RemoteFontFaceSource* source) | 58 void CSSFontFace::fontLoaded(RemoteFontFaceSource* source) |
59 { | 59 { |
60 if (!isValid() || source != m_sources.first()) | 60 if (!isValid() || source != m_sources.first()) |
61 return; | 61 return; |
62 | 62 |
63 if (loadStatus() == FontFace::Loading) { | 63 if (loadStatus() == FontFace::Loading) { |
64 if (source->isValid()) { | 64 if (source->isValid()) { |
65 setLoadStatus(FontFace::Loaded); | 65 setLoadStatus(FontFace::Loaded); |
66 } else if (source->displayPeriod() == RemoteFontFaceSource::FailurePerio
d) { | 66 } else if (source->getDisplayPeriod() == RemoteFontFaceSource::FailurePe
riod) { |
67 m_sources.clear(); | 67 m_sources.clear(); |
68 setLoadStatus(FontFace::Error); | 68 setLoadStatus(FontFace::Error); |
69 } else { | 69 } else { |
70 m_sources.removeFirst(); | 70 m_sources.removeFirst(); |
71 load(); | 71 load(); |
72 } | 72 } |
73 } | 73 } |
74 | 74 |
75 if (m_segmentedFontFace) | 75 if (m_segmentedFontFace) |
76 m_segmentedFontFace->fontFaceInvalidated(); | 76 m_segmentedFontFace->fontFaceInvalidated(); |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 else | 159 else |
160 setLoadStatus(FontFace::Loaded); | 160 setLoadStatus(FontFace::Loaded); |
161 return; | 161 return; |
162 } | 162 } |
163 } | 163 } |
164 m_sources.removeFirst(); | 164 m_sources.removeFirst(); |
165 } | 165 } |
166 setLoadStatus(FontFace::Error); | 166 setLoadStatus(FontFace::Error); |
167 } | 167 } |
168 | 168 |
169 void CSSFontFace::setLoadStatus(FontFace::LoadStatus newStatus) | 169 void CSSFontFace::setLoadStatus(FontFace::LoadStatusType newStatus) |
170 { | 170 { |
171 ASSERT(m_fontFace); | 171 ASSERT(m_fontFace); |
172 if (newStatus == FontFace::Error) | 172 if (newStatus == FontFace::Error) |
173 m_fontFace->setError(); | 173 m_fontFace->setError(); |
174 else | 174 else |
175 m_fontFace->setLoadStatus(newStatus); | 175 m_fontFace->setLoadStatus(newStatus); |
176 | 176 |
177 if (!m_segmentedFontFace) | 177 if (!m_segmentedFontFace) |
178 return; | 178 return; |
179 Document* document = m_segmentedFontFace->fontSelector()->document(); | 179 Document* document = m_segmentedFontFace->fontSelector()->document(); |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 } | 257 } |
258 | 258 |
259 DEFINE_TRACE(CSSFontFace) | 259 DEFINE_TRACE(CSSFontFace) |
260 { | 260 { |
261 visitor->trace(m_segmentedFontFace); | 261 visitor->trace(m_segmentedFontFace); |
262 visitor->trace(m_sources); | 262 visitor->trace(m_sources); |
263 visitor->trace(m_fontFace); | 263 visitor->trace(m_fontFace); |
264 } | 264 } |
265 | 265 |
266 } // namespace blink | 266 } // namespace blink |
OLD | NEW |