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 12 matching lines...) Expand all Loading... |
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 "FontFamilyNames.h" | 32 #include "FontFamilyNames.h" |
| 33 #include "RuntimeEnabledFeatures.h" |
33 #include "core/css/CSSFontFace.h" | 34 #include "core/css/CSSFontFace.h" |
34 #include "core/css/CSSFontFaceRule.h" | 35 #include "core/css/CSSFontFaceRule.h" |
35 #include "core/css/CSSFontFaceSource.h" | 36 #include "core/css/CSSFontFaceSource.h" |
36 #include "core/css/CSSFontFaceSrcValue.h" | 37 #include "core/css/CSSFontFaceSrcValue.h" |
37 #include "core/css/CSSPrimitiveValue.h" | 38 #include "core/css/CSSPrimitiveValue.h" |
38 #include "core/css/CSSSegmentedFontFace.h" | 39 #include "core/css/CSSSegmentedFontFace.h" |
39 #include "core/css/CSSUnicodeRangeValue.h" | 40 #include "core/css/CSSUnicodeRangeValue.h" |
40 #include "core/css/CSSValueList.h" | 41 #include "core/css/CSSValueList.h" |
41 #include "core/css/StylePropertySet.h" | 42 #include "core/css/StylePropertySet.h" |
42 #include "core/css/StyleRule.h" | 43 #include "core/css/StyleRule.h" |
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
597 } | 598 } |
598 // 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. |
599 cachedResourceLoader->loadDone(0); | 600 cachedResourceLoader->loadDone(0); |
600 // 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 |
601 // 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. |
602 if (m_document && m_document->frame()) | 603 if (m_document && m_document->frame()) |
603 m_document->frame()->loader()->checkLoadComplete(); | 604 m_document->frame()->loader()->checkLoadComplete(); |
604 } | 605 } |
605 | 606 |
606 } | 607 } |
OLD | NEW |