| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "core/css/StyleRule.h" | 42 #include "core/css/StyleRule.h" |
| 43 #include "core/css/resolver/StyleResolver.h" | 43 #include "core/css/resolver/StyleResolver.h" |
| 44 #include "core/dom/Document.h" | 44 #include "core/dom/Document.h" |
| 45 #include "core/loader/FrameLoader.h" | 45 #include "core/loader/FrameLoader.h" |
| 46 #include "core/loader/cache/CachedFont.h" | 46 #include "core/loader/cache/CachedFont.h" |
| 47 #include "core/loader/cache/CachedResourceLoader.h" | 47 #include "core/loader/cache/CachedResourceLoader.h" |
| 48 #include "core/page/Frame.h" | 48 #include "core/page/Frame.h" |
| 49 #include "core/page/Settings.h" | 49 #include "core/page/Settings.h" |
| 50 #include "core/platform/graphics/FontCache.h" | 50 #include "core/platform/graphics/FontCache.h" |
| 51 #include "core/platform/graphics/SimpleFontData.h" | 51 #include "core/platform/graphics/SimpleFontData.h" |
| 52 #include "core/rendering/RenderObject.h" | |
| 53 #include <wtf/text/AtomicString.h> | 52 #include <wtf/text/AtomicString.h> |
| 54 | 53 |
| 55 #if ENABLE(SVG) | 54 #if ENABLE(SVG) |
| 56 #include "SVGNames.h" | |
| 57 #include "core/svg/SVGFontFaceElement.h" | 55 #include "core/svg/SVGFontFaceElement.h" |
| 58 #endif | 56 #endif |
| 59 | 57 |
| 60 using namespace std; | 58 using namespace std; |
| 61 | 59 |
| 62 namespace WebCore { | 60 namespace WebCore { |
| 63 | 61 |
| 64 CSSFontSelector::CSSFontSelector(Document* document) | 62 CSSFontSelector::CSSFontSelector(Document* document) |
| 65 : m_document(document) | 63 : m_document(document) |
| 66 , m_beginLoadingTimer(this, &CSSFontSelector::beginLoadTimerFired) | 64 , m_beginLoadingTimer(this, &CSSFontSelector::beginLoadTimerFired) |
| (...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 } | 600 } |
| 603 // Ensure that if the request count reaches zero, the frame loader will know
about it. | 601 // Ensure that if the request count reaches zero, the frame loader will know
about it. |
| 604 cachedResourceLoader->loadDone(0); | 602 cachedResourceLoader->loadDone(0); |
| 605 // New font loads may be triggered by layout after the document load is comp
lete but before we have dispatched | 603 // New font loads may be triggered by layout after the document load is comp
lete but before we have dispatched |
| 606 // didFinishLoading for the frame. Make sure the delegate is always dispatch
ed by checking explicitly. | 604 // didFinishLoading for the frame. Make sure the delegate is always dispatch
ed by checking explicitly. |
| 607 if (m_document && m_document->frame()) | 605 if (m_document && m_document->frame()) |
| 608 m_document->frame()->loader()->checkLoadComplete(); | 606 m_document->frame()->loader()->checkLoadComplete(); |
| 609 } | 607 } |
| 610 | 608 |
| 611 } | 609 } |
| OLD | NEW |