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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 collection.appendActiveStyleSheets(engine->injectedAuthorStyleSheets()); | 151 collection.appendActiveStyleSheets(engine->injectedAuthorStyleSheets()); |
152 collection.appendActiveStyleSheets(engine->documentAuthorStyleSheets()); | 152 collection.appendActiveStyleSheets(engine->documentAuthorStyleSheets()); |
153 collectActiveCSSStyleSheetsFromSeamlessParents(collection, document()); | 153 collectActiveCSSStyleSheetsFromSeamlessParents(collection, document()); |
154 collectStyleSheets(engine, collection); | 154 collectStyleSheets(engine, collection); |
155 | 155 |
156 StyleSheetChange change; | 156 StyleSheetChange change; |
157 analyzeStyleSheetChange(updateMode, collection, change); | 157 analyzeStyleSheetChange(updateMode, collection, change); |
158 | 158 |
159 if (change.styleResolverUpdateType == Reconstruct) { | 159 if (change.styleResolverUpdateType == Reconstruct) { |
160 engine->clearResolver(); | 160 engine->clearResolver(); |
| 161 engine->resetFontSelector(); |
161 } else if (StyleResolver* styleResolver = engine->resolverIfExists()) { | 162 } else if (StyleResolver* styleResolver = engine->resolverIfExists()) { |
162 // FIXME: We might have already had styles in child treescope. In this c
ase, we cannot use buildScopedStyleTreeInDocumentOrder. | 163 // FIXME: We might have already had styles in child treescope. In this c
ase, we cannot use buildScopedStyleTreeInDocumentOrder. |
163 // Need to change "false" to some valid condition. | 164 // Need to change "false" to some valid condition. |
164 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false); | 165 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false); |
165 if (change.styleResolverUpdateType != Additive) { | 166 if (change.styleResolverUpdateType != Additive) { |
166 ASSERT(change.styleResolverUpdateType == Reset || change.styleResolv
erUpdateType == ResetStyleResolverAndFontSelector); | 167 ASSERT(change.styleResolverUpdateType == Reset || change.styleResolv
erUpdateType == ResetStyleResolverAndFontSelector); |
167 resetAllRuleSetsInTreeScope(styleResolver); | 168 resetAllRuleSetsInTreeScope(styleResolver); |
168 if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelec
tor) | 169 if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelec
tor) |
169 styleResolver->resetFontSelector(); | 170 engine->resetFontSelector(); |
170 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleShe
ets); | 171 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleShe
ets); |
171 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAutho
rStyleSheets()); | 172 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAutho
rStyleSheets()); |
172 } else { | 173 } else { |
173 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets
.size(), collection.activeAuthorStyleSheets()); | 174 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets
.size(), collection.activeAuthorStyleSheets()); |
174 } | 175 } |
| 176 } else if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelect
or) { |
| 177 engine->resetFontSelector(); |
175 } | 178 } |
176 m_scopingNodesForStyleScoped.didRemoveScopingNodes(); | 179 m_scopingNodesForStyleScoped.didRemoveScopingNodes(); |
177 collection.swap(*this); | 180 collection.swap(*this); |
178 updateUsesRemUnits(); | 181 updateUsesRemUnits(); |
179 | 182 |
180 return change.requiresFullStyleRecalc; | 183 return change.requiresFullStyleRecalc; |
181 } | 184 } |
182 | 185 |
183 } | 186 } |
OLD | NEW |