| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 m_fontFace->setLoadStatus(newStatus); | 154 m_fontFace->setLoadStatus(newStatus); |
| 155 | 155 |
| 156 if (!m_segmentedFontFace) | 156 if (!m_segmentedFontFace) |
| 157 return; | 157 return; |
| 158 Document* document = m_segmentedFontFace->fontSelector()->document(); | 158 Document* document = m_segmentedFontFace->fontSelector()->document(); |
| 159 if (!document) | 159 if (!document) |
| 160 return; | 160 return; |
| 161 | 161 |
| 162 switch (newStatus) { | 162 switch (newStatus) { |
| 163 case FontFace::Loading: | 163 case FontFace::Loading: |
| 164 FontFaceSet::from(document)->beginFontLoading(m_fontFace); | 164 FontFaceSet::from(*document)->beginFontLoading(m_fontFace); |
| 165 break; | 165 break; |
| 166 case FontFace::Loaded: | 166 case FontFace::Loaded: |
| 167 FontFaceSet::from(document)->fontLoaded(m_fontFace); | 167 FontFaceSet::from(*document)->fontLoaded(m_fontFace); |
| 168 break; | 168 break; |
| 169 case FontFace::Error: | 169 case FontFace::Error: |
| 170 FontFaceSet::from(document)->loadError(m_fontFace); | 170 FontFaceSet::from(*document)->loadError(m_fontFace); |
| 171 break; | 171 break; |
| 172 default: | 172 default: |
| 173 break; | 173 break; |
| 174 } | 174 } |
| 175 } | 175 } |
| 176 | 176 |
| 177 CSSFontFace::UnicodeRangeSet::UnicodeRangeSet(const Vector<UnicodeRange>& ranges
) | 177 CSSFontFace::UnicodeRangeSet::UnicodeRangeSet(const Vector<UnicodeRange>& ranges
) |
| 178 : m_ranges(ranges) | 178 : m_ranges(ranges) |
| 179 { | 179 { |
| 180 if (m_ranges.isEmpty()) | 180 if (m_ranges.isEmpty()) |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 UChar32 c = text.characterStartingAt(index); | 213 UChar32 c = text.characterStartingAt(index); |
| 214 index += U16_LENGTH(c); | 214 index += U16_LENGTH(c); |
| 215 Vector<UnicodeRange>::const_iterator it = std::lower_bound(m_ranges.begi
n(), m_ranges.end(), c); | 215 Vector<UnicodeRange>::const_iterator it = std::lower_bound(m_ranges.begi
n(), m_ranges.end(), c); |
| 216 if (it != m_ranges.end() && it->contains(c)) | 216 if (it != m_ranges.end() && it->contains(c)) |
| 217 return true; | 217 return true; |
| 218 } | 218 } |
| 219 return false; | 219 return false; |
| 220 } | 220 } |
| 221 | 221 |
| 222 } | 222 } |
| OLD | NEW |