| 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 11 matching lines...) Expand all Loading... |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/css/CSSFontSelector.h" | 28 #include "core/css/CSSFontSelector.h" |
| 29 | 29 |
| 30 #include "CSSPropertyNames.h" | 30 #include "CSSPropertyNames.h" |
| 31 #include "CSSValueKeywords.h" | 31 #include "CSSValueKeywords.h" |
| 32 #include "Document.h" | |
| 33 #include "WebKitFontFamilyNames.h" | 32 #include "WebKitFontFamilyNames.h" |
| 34 #include "core/css/CSSFontFace.h" | 33 #include "core/css/CSSFontFace.h" |
| 35 #include "core/css/CSSFontFaceRule.h" | 34 #include "core/css/CSSFontFaceRule.h" |
| 36 #include "core/css/CSSFontFaceSource.h" | 35 #include "core/css/CSSFontFaceSource.h" |
| 37 #include "core/css/CSSFontFaceSrcValue.h" | 36 #include "core/css/CSSFontFaceSrcValue.h" |
| 38 #include "core/css/CSSPrimitiveValue.h" | 37 #include "core/css/CSSPrimitiveValue.h" |
| 39 #include "core/css/CSSSegmentedFontFace.h" | 38 #include "core/css/CSSSegmentedFontFace.h" |
| 40 #include "core/css/CSSUnicodeRangeValue.h" | 39 #include "core/css/CSSUnicodeRangeValue.h" |
| 41 #include "core/css/CSSValueList.h" | 40 #include "core/css/CSSValueList.h" |
| 42 #include "core/css/StylePropertySet.h" | 41 #include "core/css/StylePropertySet.h" |
| 43 #include "core/css/StyleResolver.h" | 42 #include "core/css/StyleResolver.h" |
| 44 #include "core/css/StyleRule.h" | 43 #include "core/css/StyleRule.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" | 52 #include "core/rendering/RenderObject.h" |
| 53 #include <wtf/text/AtomicString.h> | 53 #include <wtf/text/AtomicString.h> |
| 54 | 54 |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 } | 602 } |
| 603 // Ensure that if the request count reaches zero, the frame loader will know
about it. | 603 // Ensure that if the request count reaches zero, the frame loader will know
about it. |
| 604 cachedResourceLoader->loadDone(0); | 604 cachedResourceLoader->loadDone(0); |
| 605 // New font loads may be triggered by layout after the document load is comp
lete but before we have dispatched | 605 // 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. | 606 // didFinishLoading for the frame. Make sure the delegate is always dispatch
ed by checking explicitly. |
| 607 if (m_document && m_document->frame()) | 607 if (m_document && m_document->frame()) |
| 608 m_document->frame()->loader()->checkLoadComplete(); | 608 m_document->frame()->loader()->checkLoadComplete(); |
| 609 } | 609 } |
| 610 | 610 |
| 611 } | 611 } |
| OLD | NEW |