| 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 #if !ENABLE(OILPAN) | 152 #if !ENABLE(OILPAN) |
| 153 void CSSFontSelector::clearDocument() | 153 void CSSFontSelector::clearDocument() |
| 154 { | 154 { |
| 155 m_fontLoader->clearResourceFetcher(); | 155 m_fontLoader->clearResourceFetcher(); |
| 156 m_document = nullptr; | 156 m_document = nullptr; |
| 157 } | 157 } |
| 158 #endif | 158 #endif |
| 159 | 159 |
| 160 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) | 160 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) |
| 161 { | 161 { |
| 162 ASSERT(document.settings()); | 162 if (!document.settings()) |
| 163 return; |
| 163 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); | 164 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); |
| 164 } | 165 } |
| 165 | 166 |
| 166 void CSSFontSelector::trace(Visitor* visitor) | 167 void CSSFontSelector::trace(Visitor* visitor) |
| 167 { | 168 { |
| 168 visitor->trace(m_document); | 169 visitor->trace(m_document); |
| 169 visitor->trace(m_fontFaceCache); | 170 visitor->trace(m_fontFaceCache); |
| 170 visitor->trace(m_clients); | 171 visitor->trace(m_clients); |
| 171 visitor->trace(m_fontLoader); | 172 visitor->trace(m_fontLoader); |
| 172 FontSelector::trace(visitor); | 173 FontSelector::trace(visitor); |
| 173 } | 174 } |
| 174 | 175 |
| 175 } | 176 } |
| OLD | NEW |