| 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 | 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_genericFontFamilySettings( | 47 m_genericFontFamilySettings( |
| 48 document->frame()->settings()->genericFontFamilySettings()) { | 48 document->frame()->settings()->genericFontFamilySettings()) { |
| 49 // FIXME: An old comment used to say there was no need to hold a reference to | 49 // FIXME: An old comment used to say there was no need to hold a reference to |
| 50 // m_document because "we are guaranteed to be destroyed before the document". | 50 // m_document because "we are guaranteed to be destroyed before the document". |
| 51 // But there does not seem to be any such guarantee. | 51 // But there does not seem to be any such guarantee. |
| 52 ASSERT(m_document); | 52 DCHECK(m_document); |
| 53 DCHECK(m_document->frame()); | 53 DCHECK(m_document->frame()); |
| 54 FontCache::fontCache()->addClient(this); | 54 FontCache::fontCache()->addClient(this); |
| 55 FontFaceSet::from(*document)->addFontFacesToFontFaceCache(&m_fontFaceCache, | 55 FontFaceSet::from(*document)->addFontFacesToFontFaceCache(&m_fontFaceCache, |
| 56 this); | 56 this); |
| 57 } | 57 } |
| 58 | 58 |
| 59 CSSFontSelector::~CSSFontSelector() {} | 59 CSSFontSelector::~CSSFontSelector() {} |
| 60 | 60 |
| 61 void CSSFontSelector::registerForInvalidationCallbacks( | 61 void CSSFontSelector::registerForInvalidationCallbacks( |
| 62 CSSFontSelectorClient* client) { | 62 CSSFontSelectorClient* client) { |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 } | 174 } |
| 175 | 175 |
| 176 DEFINE_TRACE(CSSFontSelector) { | 176 DEFINE_TRACE(CSSFontSelector) { |
| 177 visitor->trace(m_document); | 177 visitor->trace(m_document); |
| 178 visitor->trace(m_fontFaceCache); | 178 visitor->trace(m_fontFaceCache); |
| 179 visitor->trace(m_clients); | 179 visitor->trace(m_clients); |
| 180 FontSelector::trace(visitor); | 180 FontSelector::trace(visitor); |
| 181 } | 181 } |
| 182 | 182 |
| 183 } // namespace blink | 183 } // namespace blink |
| OLD | NEW |