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 | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All |
7 * rights reserved. | 7 * rights reserved. |
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
9 * (http://www.torchmobile.com/) | 9 * (http://www.torchmobile.com/) |
10 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 // was modified or not. We should only remove modified/removed @font-face | 104 // was modified or not. We should only remove modified/removed @font-face |
105 // rules, or @font-face rules from removed stylesheets. We currently avoid | 105 // rules, or @font-face rules from removed stylesheets. We currently avoid |
106 // clearing the font cache when we have had an analyzed update and no | 106 // clearing the font cache when we have had an analyzed update and no |
107 // @font-face rules were removed, in which case requiresFullStyleRecalc will | 107 // @font-face rules were removed, in which case requiresFullStyleRecalc will |
108 // be false. | 108 // be false. |
109 if (change.requiresFullStyleRecalc) | 109 if (change.requiresFullStyleRecalc) |
110 engine.clearFontCache(); | 110 engine.clearFontCache(); |
111 } else if (StyleResolver* styleResolver = engine.resolver()) { | 111 } else if (StyleResolver* styleResolver = engine.resolver()) { |
112 if (change.styleResolverUpdateType != Additive) { | 112 if (change.styleResolverUpdateType != Additive) { |
113 DCHECK_EQ(change.styleResolverUpdateType, Reset); | 113 DCHECK_EQ(change.styleResolverUpdateType, Reset); |
114 styleResolver->resetAuthorStyle(treeScope()); | 114 engine.resetAuthorStyle(treeScope()); |
115 engine.removeFontFaceRules(change.fontFaceRulesToRemove); | 115 engine.removeFontFaceRules(change.fontFaceRulesToRemove); |
116 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleSheets); | 116 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleSheets); |
117 styleResolver->lazyAppendAuthorStyleSheets( | 117 styleResolver->lazyAppendAuthorStyleSheets( |
118 0, collection->activeAuthorStyleSheets()); | 118 0, collection->activeAuthorStyleSheets()); |
119 } else { | 119 } else { |
120 styleResolver->lazyAppendAuthorStyleSheets( | 120 styleResolver->lazyAppendAuthorStyleSheets( |
121 m_activeAuthorStyleSheets.size(), | 121 m_activeAuthorStyleSheets.size(), |
122 collection->activeAuthorStyleSheets()); | 122 collection->activeAuthorStyleSheets()); |
123 } | 123 } |
124 } | 124 } |
(...skipping 18 matching lines...) Expand all Loading... |
143 continue; | 143 continue; |
144 if (!candidate.canBeActivated( | 144 if (!candidate.canBeActivated( |
145 document().styleEngine().preferredStylesheetSetName())) | 145 document().styleEngine().preferredStylesheetSetName())) |
146 continue; | 146 continue; |
147 viewportResolver.collectViewportRulesFromAuthorSheet( | 147 viewportResolver.collectViewportRulesFromAuthorSheet( |
148 *toCSSStyleSheet(sheet)); | 148 *toCSSStyleSheet(sheet)); |
149 } | 149 } |
150 } | 150 } |
151 | 151 |
152 } // namespace blink | 152 } // namespace blink |
OLD | NEW |