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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Issue 2472613004: Remove ShadowRoot::numberOfStyles(). (Closed)
Patch Set: Rebased Created 4 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 static void collectScopedResolversForHostedShadowTrees( 164 static void collectScopedResolversForHostedShadowTrees(
165 const Element& element, 165 const Element& element,
166 HeapVector<Member<ScopedStyleResolver>, 8>& resolvers) { 166 HeapVector<Member<ScopedStyleResolver>, 8>& resolvers) {
167 ElementShadow* shadow = element.shadow(); 167 ElementShadow* shadow = element.shadow();
168 if (!shadow) 168 if (!shadow)
169 return; 169 return;
170 170
171 // Adding scoped resolver for active shadow roots for shadow host styling. 171 // Adding scoped resolver for active shadow roots for shadow host styling.
172 for (ShadowRoot* shadowRoot = &shadow->youngestShadowRoot(); shadowRoot; 172 for (ShadowRoot* shadowRoot = &shadow->youngestShadowRoot(); shadowRoot;
173 shadowRoot = shadowRoot->olderShadowRoot()) { 173 shadowRoot = shadowRoot->olderShadowRoot()) {
174 if (shadowRoot->numberOfStyles() > 0) { 174 if (ScopedStyleResolver* resolver = shadowRoot->scopedStyleResolver())
175 if (ScopedStyleResolver* resolver = shadowRoot->scopedStyleResolver()) 175 resolvers.append(resolver);
176 resolvers.append(resolver);
177 }
178 } 176 }
179 } 177 }
180 178
181 StyleResolver::StyleResolver(Document& document) 179 StyleResolver::StyleResolver(Document& document)
182 : m_document(document), 180 : m_document(document),
183 m_printMediaType(false), 181 m_printMediaType(false),
184 m_styleSharingDepth(0) { 182 m_styleSharingDepth(0) {
185 FrameView* view = document.view(); 183 FrameView* view = document.view();
186 DCHECK(view); 184 DCHECK(view);
187 m_medium = new MediaQueryEvaluator(&view->frame()); 185 m_medium = new MediaQueryEvaluator(&view->frame());
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 } 312 }
315 313
316 static void matchHostRules(const Element& element, 314 static void matchHostRules(const Element& element,
317 ElementRuleCollector& collector) { 315 ElementRuleCollector& collector) {
318 ElementShadow* shadow = element.shadow(); 316 ElementShadow* shadow = element.shadow();
319 if (!shadow) 317 if (!shadow)
320 return; 318 return;
321 319
322 for (ShadowRoot* shadowRoot = &shadow->oldestShadowRoot(); shadowRoot; 320 for (ShadowRoot* shadowRoot = &shadow->oldestShadowRoot(); shadowRoot;
323 shadowRoot = shadowRoot->youngerShadowRoot()) { 321 shadowRoot = shadowRoot->youngerShadowRoot()) {
324 if (!shadowRoot->numberOfStyles())
325 continue;
326 if (ScopedStyleResolver* resolver = shadowRoot->scopedStyleResolver()) { 322 if (ScopedStyleResolver* resolver = shadowRoot->scopedStyleResolver()) {
327 collector.clearMatchedRules(); 323 collector.clearMatchedRules();
328 resolver->collectMatchingShadowHostRules(collector); 324 resolver->collectMatchingShadowHostRules(collector);
329 collector.sortAndTransferMatchedRules(); 325 collector.sortAndTransferMatchedRules();
330 collector.finishAddingAuthorRulesForTreeScope(); 326 collector.finishAddingAuthorRulesForTreeScope();
331 } 327 }
332 } 328 }
333 } 329 }
334 330
335 static void matchSlottedRules(const Element& element, 331 static void matchSlottedRules(const Element& element,
(...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1829 visitor->trace(m_medium); 1825 visitor->trace(m_medium);
1830 visitor->trace(m_viewportDependentMediaQueryResults); 1826 visitor->trace(m_viewportDependentMediaQueryResults);
1831 visitor->trace(m_deviceDependentMediaQueryResults); 1827 visitor->trace(m_deviceDependentMediaQueryResults);
1832 visitor->trace(m_selectorFilter); 1828 visitor->trace(m_selectorFilter);
1833 visitor->trace(m_styleSharingLists); 1829 visitor->trace(m_styleSharingLists);
1834 visitor->trace(m_pendingStyleSheets); 1830 visitor->trace(m_pendingStyleSheets);
1835 visitor->trace(m_document); 1831 visitor->trace(m_document);
1836 } 1832 }
1837 1833
1838 } // namespace blink 1834 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/shadow-dom/host-link-style.html ('k') | third_party/WebKit/Source/core/dom/StyleElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698