Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: Source/core/dom/ShadowTreeStyleSheetCollection.cpp

Issue 330043002: Simplified code for styleResolverChanged. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/dom/ShadowTreeStyleSheetCollection.h ('k') | Source/core/dom/StyleEngine.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 if (rel.contains("alternate") && title.isEmpty()) 80 if (rel.contains("alternate") && title.isEmpty())
81 activeSheet = 0; 81 activeSheet = 0;
82 82
83 if (sheet) 83 if (sheet)
84 collection.appendSheetForList(sheet); 84 collection.appendSheetForList(sheet);
85 if (activeSheet) 85 if (activeSheet)
86 collection.appendActiveStyleSheet(activeSheet); 86 collection.appendActiveStyleSheet(activeSheet);
87 } 87 }
88 } 88 }
89 89
90 bool ShadowTreeStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine , StyleResolverUpdateMode updateMode) 90 void ShadowTreeStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine , StyleResolverUpdateMode updateMode)
91 { 91 {
92 StyleSheetCollection collection; 92 StyleSheetCollection collection;
93 collectStyleSheets(engine, collection); 93 collectStyleSheets(engine, collection);
94 94
95 StyleSheetChange change; 95 StyleSheetChange change;
96 analyzeStyleSheetChange(updateMode, collection, change); 96 analyzeStyleSheetChange(updateMode, collection, change);
97 97
98 if (StyleResolver* styleResolver = engine->resolver()) { 98 if (StyleResolver* styleResolver = engine->resolver()) {
99 // FIXME: We might have already had styles in child treescope. In this c ase, we cannot use buildScopedStyleTreeInDocumentOrder. 99 // FIXME: We might have already had styles in child treescope. In this c ase, we cannot use buildScopedStyleTreeInDocumentOrder.
100 // Need to change "false" to some valid condition. 100 // Need to change "false" to some valid condition.
101 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false); 101 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false);
102 if (change.styleResolverUpdateType != Additive) { 102 if (change.styleResolverUpdateType != Additive) {
103 // We should not destroy StyleResolver when we find any stylesheet u pdate in a shadow tree. 103 // We should not destroy StyleResolver when we find any stylesheet u pdate in a shadow tree.
104 // In this case, we will reset rulesets created from style elements in the shadow tree. 104 // In this case, we will reset rulesets created from style elements in the shadow tree.
105 resetAllRuleSetsInTreeScope(styleResolver); 105 resetAllRuleSetsInTreeScope(styleResolver);
106 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleShe ets); 106 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleShe ets);
107 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAutho rStyleSheets()); 107 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAutho rStyleSheets());
108 } else { 108 } else {
109 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets .size(), collection.activeAuthorStyleSheets()); 109 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets .size(), collection.activeAuthorStyleSheets());
110 } 110 }
111 } 111 }
112 if (change.requiresFullStyleRecalc) 112 if (change.requiresFullStyleRecalc)
113 toShadowRoot(m_treeScope.rootNode()).host()->setNeedsStyleRecalc(Subtree StyleChange); 113 toShadowRoot(m_treeScope.rootNode()).host()->setNeedsStyleRecalc(Subtree StyleChange);
114 114
115 m_scopingNodesForStyleScoped.didRemoveScopingNodes(); 115 m_scopingNodesForStyleScoped.didRemoveScopingNodes();
116 collection.swap(*this); 116 collection.swap(*this);
117 updateUsesRemUnits(); 117 updateUsesRemUnits();
118
119 return change.requiresFullStyleRecalc;
120 } 118 }
121 119
122 } 120 }
OLDNEW
« no previous file with comments | « Source/core/dom/ShadowTreeStyleSheetCollection.h ('k') | Source/core/dom/StyleEngine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698