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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 // CSSFontSelector could get deleted via beginLoadIfNeeded() or loadDone() u
nless protected. | 590 // CSSFontSelector could get deleted via beginLoadIfNeeded() or loadDone() u
nless protected. |
591 RefPtr<CSSFontSelector> protect(this); | 591 RefPtr<CSSFontSelector> protect(this); |
592 | 592 |
593 CachedResourceLoader* cachedResourceLoader = m_document->cachedResourceLoade
r(); | 593 CachedResourceLoader* cachedResourceLoader = m_document->cachedResourceLoade
r(); |
594 for (size_t i = 0; i < fontsToBeginLoading.size(); ++i) { | 594 for (size_t i = 0; i < fontsToBeginLoading.size(); ++i) { |
595 fontsToBeginLoading[i]->beginLoadIfNeeded(cachedResourceLoader); | 595 fontsToBeginLoading[i]->beginLoadIfNeeded(cachedResourceLoader); |
596 // Balances incrementRequestCount() in beginLoadingFontSoon(). | 596 // Balances incrementRequestCount() in beginLoadingFontSoon(). |
597 cachedResourceLoader->decrementRequestCount(fontsToBeginLoading[i].get()
); | 597 cachedResourceLoader->decrementRequestCount(fontsToBeginLoading[i].get()
); |
598 } | 598 } |
599 // Ensure that if the request count reaches zero, the frame loader will know
about it. | 599 // Ensure that if the request count reaches zero, the frame loader will know
about it. |
600 cachedResourceLoader->loadDone(0); | 600 cachedResourceLoader->didLoadResource(0); |
601 // New font loads may be triggered by layout after the document load is comp
lete but before we have dispatched | 601 // New font loads may be triggered by layout after the document load is comp
lete but before we have dispatched |
602 // didFinishLoading for the frame. Make sure the delegate is always dispatch
ed by checking explicitly. | 602 // didFinishLoading for the frame. Make sure the delegate is always dispatch
ed by checking explicitly. |
603 if (m_document && m_document->frame()) | 603 if (m_document && m_document->frame()) |
604 m_document->frame()->loader()->checkLoadComplete(); | 604 m_document->frame()->loader()->checkLoadComplete(); |
605 } | 605 } |
606 | 606 |
607 } | 607 } |
OLD | NEW |