OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r
ights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r
ights reserved. |
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
9 * Copyright (C) 2013 Google Inc. All rights reserved. | 9 * Copyright (C) 2013 Google Inc. All rights reserved. |
10 * | 10 * |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 bool DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine,
StyleResolverUpdateMode updateMode) | 157 bool DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine,
StyleResolverUpdateMode updateMode) |
158 { | 158 { |
159 StyleSheetCollectionBase collection; | 159 StyleSheetCollectionBase collection; |
160 engine->collectDocumentActiveStyleSheets(collection); | 160 engine->collectDocumentActiveStyleSheets(collection); |
161 | 161 |
162 StyleSheetChange change; | 162 StyleSheetChange change; |
163 analyzeStyleSheetChange(updateMode, collection, change); | 163 analyzeStyleSheetChange(updateMode, collection, change); |
164 | 164 |
165 if (change.styleResolverUpdateType == Reconstruct) { | 165 if (change.styleResolverUpdateType == Reconstruct) { |
166 engine->clearMasterResolver(); | 166 engine->clearMasterResolver(); |
| 167 engine->resetFontSelector(); |
167 } else if (StyleResolver* styleResolver = engine->resolver()) { | 168 } else if (StyleResolver* styleResolver = engine->resolver()) { |
168 // FIXME: We might have already had styles in child treescope. In this c
ase, we cannot use buildScopedStyleTreeInDocumentOrder. | 169 // FIXME: We might have already had styles in child treescope. In this c
ase, we cannot use buildScopedStyleTreeInDocumentOrder. |
169 // Need to change "false" to some valid condition. | 170 // Need to change "false" to some valid condition. |
170 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false); | 171 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false); |
171 if (change.styleResolverUpdateType != Additive) { | 172 if (change.styleResolverUpdateType != Additive) { |
172 ASSERT(change.styleResolverUpdateType == Reset || change.styleResolv
erUpdateType == ResetStyleResolverAndFontSelector); | 173 ASSERT(change.styleResolverUpdateType == Reset || change.styleResolv
erUpdateType == ResetStyleResolverAndFontSelector); |
173 resetAllRuleSetsInTreeScope(styleResolver); | 174 resetAllRuleSetsInTreeScope(styleResolver); |
174 if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelec
tor) | 175 if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelec
tor) |
175 styleResolver->resetFontSelector(); | 176 engine->resetFontSelector(); |
176 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleShe
ets); | 177 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleShe
ets); |
177 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAutho
rStyleSheets()); | 178 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAutho
rStyleSheets()); |
178 } else { | 179 } else { |
179 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets
.size(), collection.activeAuthorStyleSheets()); | 180 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets
.size(), collection.activeAuthorStyleSheets()); |
180 } | 181 } |
| 182 } else if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelect
or) { |
| 183 engine->resetFontSelector(); |
181 } | 184 } |
182 m_scopingNodesForStyleScoped.didRemoveScopingNodes(); | 185 m_scopingNodesForStyleScoped.didRemoveScopingNodes(); |
183 collection.swap(*this); | 186 collection.swap(*this); |
184 updateUsesRemUnits(); | 187 updateUsesRemUnits(); |
185 | 188 |
186 return change.requiresFullStyleRecalc; | 189 return change.requiresFullStyleRecalc; |
187 } | 190 } |
188 | 191 |
189 } | 192 } |
OLD | NEW |