| 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 |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 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 "sky/engine/config.h" |
| 28 #include "core/css/CSSFontSelector.h" | 28 #include "sky/engine/core/css/CSSFontSelector.h" |
| 29 | 29 |
| 30 #include "core/css/CSSFontSelectorClient.h" | |
| 31 #include "core/css/CSSSegmentedFontFace.h" | |
| 32 #include "core/css/CSSValueList.h" | |
| 33 #include "core/css/FontFaceSet.h" | |
| 34 #include "core/css/resolver/StyleResolver.h" | |
| 35 #include "core/dom/Document.h" | |
| 36 #include "core/frame/LocalFrame.h" | |
| 37 #include "core/frame/Settings.h" | |
| 38 #include "gen/sky/platform/RuntimeEnabledFeatures.h" | 30 #include "gen/sky/platform/RuntimeEnabledFeatures.h" |
| 39 #include "platform/fonts/FontCache.h" | 31 #include "sky/engine/core/css/CSSFontSelectorClient.h" |
| 40 #include "platform/fonts/SimpleFontData.h" | 32 #include "sky/engine/core/css/CSSSegmentedFontFace.h" |
| 41 #include "wtf/text/AtomicString.h" | 33 #include "sky/engine/core/css/CSSValueList.h" |
| 34 #include "sky/engine/core/css/FontFaceSet.h" |
| 35 #include "sky/engine/core/css/resolver/StyleResolver.h" |
| 36 #include "sky/engine/core/dom/Document.h" |
| 37 #include "sky/engine/core/frame/LocalFrame.h" |
| 38 #include "sky/engine/core/frame/Settings.h" |
| 39 #include "sky/engine/platform/fonts/FontCache.h" |
| 40 #include "sky/engine/platform/fonts/SimpleFontData.h" |
| 41 #include "sky/engine/wtf/text/AtomicString.h" |
| 42 | 42 |
| 43 namespace blink { | 43 namespace blink { |
| 44 | 44 |
| 45 CSSFontSelector::CSSFontSelector(Document* document) | 45 CSSFontSelector::CSSFontSelector(Document* document) |
| 46 : m_document(document) | 46 : m_document(document) |
| 47 , m_fontLoader(FontLoader::create(this, document->fetcher())) | 47 , m_fontLoader(FontLoader::create(this, document->fetcher())) |
| 48 , m_genericFontFamilySettings(document->frame()->settings()->genericFontFami
lySettings()) | 48 , m_genericFontFamilySettings(document->frame()->settings()->genericFontFami
lySettings()) |
| 49 { | 49 { |
| 50 // FIXME: An old comment used to say there was no need to hold a reference t
o m_document | 50 // FIXME: An old comment used to say there was no need to hold a reference t
o m_document |
| 51 // because "we are guaranteed to be destroyed before the document". But ther
e does not | 51 // because "we are guaranteed to be destroyed before the document". But ther
e does not |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) | 166 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) |
| 167 { | 167 { |
| 168 if (!document.settings()) | 168 if (!document.settings()) |
| 169 return; | 169 return; |
| 170 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); | 170 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); |
| 171 // Need to increment FontFaceCache version to update RenderStyles. | 171 // Need to increment FontFaceCache version to update RenderStyles. |
| 172 m_fontFaceCache.incrementVersion(); | 172 m_fontFaceCache.incrementVersion(); |
| 173 } | 173 } |
| 174 | 174 |
| 175 } | 175 } |
| OLD | NEW |