| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 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 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include "config.h" | 29 #include "config.h" |
| 30 #include "core/platform/graphics/FontFallbackList.h" | 30 #include "core/platform/graphics/FontFallbackList.h" |
| 31 | 31 |
| 32 #include "core/platform/graphics/Font.h" | |
| 33 #include "core/platform/graphics/FontCache.h" | 32 #include "core/platform/graphics/FontCache.h" |
| 34 #include "core/platform/graphics/SegmentedFontData.h" | 33 #include "core/platform/graphics/SegmentedFontData.h" |
| 35 | 34 |
| 36 namespace WebCore { | 35 namespace WebCore { |
| 37 | 36 |
| 38 FontFallbackList::FontFallbackList() | 37 FontFallbackList::FontFallbackList() |
| 39 : m_pageZero(0) | 38 : m_pageZero(0) |
| 40 , m_cachedPrimarySimpleFontData(0) | 39 , m_cachedPrimarySimpleFontData(0) |
| 41 , m_fontSelector(0) | 40 , m_fontSelector(0) |
| 42 , m_fontSelectorVersion(0) | 41 , m_fontSelectorVersion(0) |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 115 |
| 117 void FontFallbackList::setPlatformFont(const FontPlatformData& platformData) | 116 void FontFallbackList::setPlatformFont(const FontPlatformData& platformData) |
| 118 { | 117 { |
| 119 m_familyIndex = cAllFamiliesScanned; | 118 m_familyIndex = cAllFamiliesScanned; |
| 120 ASSERT(fontCache()->generation() == m_generation); | 119 ASSERT(fontCache()->generation() == m_generation); |
| 121 RefPtr<FontData> fontData = fontCache()->getCachedFontData(&platformData); | 120 RefPtr<FontData> fontData = fontCache()->getCachedFontData(&platformData); |
| 122 m_fontList.append(fontData); | 121 m_fontList.append(fontData); |
| 123 } | 122 } |
| 124 | 123 |
| 125 } | 124 } |
| OLD | NEW |