| 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 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 3 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 { | 56 { |
| 57 if (!m_resourceFetcher || !fontResource->stillNeedsLoad()) | 57 if (!m_resourceFetcher || !fontResource->stillNeedsLoad()) |
| 58 return; | 58 return; |
| 59 | 59 |
| 60 m_fontsToBeginLoading.append(fontResource); | 60 m_fontsToBeginLoading.append(fontResource); |
| 61 // FIXME: Use RequestCountTracker??!! | 61 // FIXME: Use RequestCountTracker??!! |
| 62 // Increment the request count now, in order to prevent didFinishLoad from b
eing dispatched | 62 // Increment the request count now, in order to prevent didFinishLoad from b
eing dispatched |
| 63 // after this font has been requested but before it began loading. Balanced
by | 63 // after this font has been requested but before it began loading. Balanced
by |
| 64 // decrementRequestCount() in beginLoadTimerFired() and in clearDocument(). | 64 // decrementRequestCount() in beginLoadTimerFired() and in clearDocument(). |
| 65 m_resourceFetcher->incrementRequestCount(fontResource); | 65 m_resourceFetcher->incrementRequestCount(fontResource); |
| 66 m_beginLoadingTimer.startOneShot(0); | 66 m_beginLoadingTimer.startOneShot(0, FROM_HERE); |
| 67 } | 67 } |
| 68 | 68 |
| 69 void FontLoader::beginLoadTimerFired(Timer<WebCore::FontLoader>*) | 69 void FontLoader::beginLoadTimerFired(Timer<WebCore::FontLoader>*) |
| 70 { | 70 { |
| 71 loadPendingFonts(); | 71 loadPendingFonts(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 void FontLoader::loadPendingFonts() | 74 void FontLoader::loadPendingFonts() |
| 75 { | 75 { |
| 76 ASSERT(m_resourceFetcher); | 76 ASSERT(m_resourceFetcher); |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 m_fontLoader.loadPendingFonts(); | 219 m_fontLoader.loadPendingFonts(); |
| 220 } | 220 } |
| 221 | 221 |
| 222 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) | 222 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) |
| 223 { | 223 { |
| 224 ASSERT(document.settings()); | 224 ASSERT(document.settings()); |
| 225 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); | 225 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); |
| 226 } | 226 } |
| 227 | 227 |
| 228 } | 228 } |
| OLD | NEW |