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

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

Issue 2488633002: Remove ShadowRoot::numberOfStyles(). (Closed)
Patch Set: 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 static void collectScopedResolversForHostedShadowTrees( 166 static void collectScopedResolversForHostedShadowTrees(
167 const Element& element, 167 const Element& element,
168 HeapVector<Member<ScopedStyleResolver>, 8>& resolvers) { 168 HeapVector<Member<ScopedStyleResolver>, 8>& resolvers) {
169 ElementShadow* shadow = element.shadow(); 169 ElementShadow* shadow = element.shadow();
170 if (!shadow) 170 if (!shadow)
171 return; 171 return;
172 172
173 // Adding scoped resolver for active shadow roots for shadow host styling. 173 // Adding scoped resolver for active shadow roots for shadow host styling.
174 for (ShadowRoot* shadowRoot = &shadow->youngestShadowRoot(); shadowRoot; 174 for (ShadowRoot* shadowRoot = &shadow->youngestShadowRoot(); shadowRoot;
175 shadowRoot = shadowRoot->olderShadowRoot()) { 175 shadowRoot = shadowRoot->olderShadowRoot()) {
176 if (shadowRoot->numberOfStyles() > 0) { 176 if (ScopedStyleResolver* resolver = shadowRoot->scopedStyleResolver())
177 if (ScopedStyleResolver* resolver = shadowRoot->scopedStyleResolver()) 177 resolvers.append(resolver);
178 resolvers.append(resolver);
179 }
180 } 178 }
181 } 179 }
182 180
183 StyleResolver::StyleResolver(Document& document) 181 StyleResolver::StyleResolver(Document& document)
184 : m_document(document), 182 : m_document(document),
185 m_viewportStyleResolver(ViewportStyleResolver::create(&document)), 183 m_viewportStyleResolver(ViewportStyleResolver::create(&document)),
186 m_needCollectFeatures(false), 184 m_needCollectFeatures(false),
187 m_printMediaType(false), 185 m_printMediaType(false),
188 m_styleSharingDepth(0) { 186 m_styleSharingDepth(0) {
189 FrameView* view = document.view(); 187 FrameView* view = document.view();
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 } 425 }
428 426
429 static void matchHostRules(const Element& element, 427 static void matchHostRules(const Element& element,
430 ElementRuleCollector& collector) { 428 ElementRuleCollector& collector) {
431 ElementShadow* shadow = element.shadow(); 429 ElementShadow* shadow = element.shadow();
432 if (!shadow) 430 if (!shadow)
433 return; 431 return;
434 432
435 for (ShadowRoot* shadowRoot = &shadow->oldestShadowRoot(); shadowRoot; 433 for (ShadowRoot* shadowRoot = &shadow->oldestShadowRoot(); shadowRoot;
436 shadowRoot = shadowRoot->youngerShadowRoot()) { 434 shadowRoot = shadowRoot->youngerShadowRoot()) {
437 if (!shadowRoot->numberOfStyles())
438 continue;
439 if (ScopedStyleResolver* resolver = shadowRoot->scopedStyleResolver()) { 435 if (ScopedStyleResolver* resolver = shadowRoot->scopedStyleResolver()) {
440 collector.clearMatchedRules(); 436 collector.clearMatchedRules();
441 resolver->collectMatchingShadowHostRules(collector); 437 resolver->collectMatchingShadowHostRules(collector);
442 collector.sortAndTransferMatchedRules(); 438 collector.sortAndTransferMatchedRules();
443 collector.finishAddingAuthorRulesForTreeScope(); 439 collector.finishAddingAuthorRulesForTreeScope();
444 } 440 }
445 } 441 }
446 } 442 }
447 443
448 static void matchSlottedRules(const Element& element, 444 static void matchSlottedRules(const Element& element,
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after
1948 visitor->trace(m_siblingRuleSet); 1944 visitor->trace(m_siblingRuleSet);
1949 visitor->trace(m_uncommonAttributeRuleSet); 1945 visitor->trace(m_uncommonAttributeRuleSet);
1950 visitor->trace(m_watchedSelectorsRules); 1946 visitor->trace(m_watchedSelectorsRules);
1951 visitor->trace(m_treeBoundaryCrossingScopes); 1947 visitor->trace(m_treeBoundaryCrossingScopes);
1952 visitor->trace(m_styleSharingLists); 1948 visitor->trace(m_styleSharingLists);
1953 visitor->trace(m_pendingStyleSheets); 1949 visitor->trace(m_pendingStyleSheets);
1954 visitor->trace(m_document); 1950 visitor->trace(m_document);
1955 } 1951 }
1956 1952
1957 } // namespace blink 1953 } // 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