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

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

Issue 789403005: Keep a separate list of :host(-context) rules. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added tests Created 6 years 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/css/resolver/ScopedStyleResolver.cpp ('k') | no next file » | 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) 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. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 371
372 void StyleResolver::matchAuthorRulesForShadowHost(Element* element, ElementRuleC ollector& collector, bool includeEmptyRules, WillBeHeapVector<RawPtrWillBeMember <ScopedStyleResolver>, 8>& resolvers, WillBeHeapVector<RawPtrWillBeMember<Scoped StyleResolver>, 8>& resolversInShadowTree) 372 void StyleResolver::matchAuthorRulesForShadowHost(Element* element, ElementRuleC ollector& collector, bool includeEmptyRules, WillBeHeapVector<RawPtrWillBeMember <ScopedStyleResolver>, 8>& resolvers, WillBeHeapVector<RawPtrWillBeMember<Scoped StyleResolver>, 8>& resolversInShadowTree)
373 { 373 {
374 collector.clearMatchedRules(); 374 collector.clearMatchedRules();
375 collector.matchedResult().ranges.lastAuthorRule = collector.matchedResult(). matchedProperties.size() - 1; 375 collector.matchedResult().ranges.lastAuthorRule = collector.matchedResult(). matchedProperties.size() - 1;
376 376
377 CascadeScope cascadeScope = 0; 377 CascadeScope cascadeScope = 0;
378 CascadeOrder cascadeOrder = 0; 378 CascadeOrder cascadeOrder = 0;
379 379
380 for (int j = resolversInShadowTree.size() - 1; j >= 0; --j) 380 for (int j = resolversInShadowTree.size() - 1; j >= 0; --j)
381 resolversInShadowTree.at(j)->collectMatchingAuthorRules(collector, inclu deEmptyRules, cascadeScope, cascadeOrder++); 381 resolversInShadowTree.at(j)->collectMatchingShadowHostRules(collector, i ncludeEmptyRules, cascadeScope, cascadeOrder++);
382 382
383 if (resolvers.isEmpty() || resolvers.first()->treeScope() != element->treeSc ope()) 383 if (resolvers.isEmpty() || resolvers.first()->treeScope() != element->treeSc ope())
384 ++cascadeScope; 384 ++cascadeScope;
385 cascadeOrder += resolvers.size(); 385 cascadeOrder += resolvers.size();
386 for (unsigned i = 0; i < resolvers.size(); ++i) 386 for (unsigned i = 0; i < resolvers.size(); ++i)
387 resolvers.at(i)->collectMatchingAuthorRules(collector, includeEmptyRules , cascadeScope++, --cascadeOrder); 387 resolvers.at(i)->collectMatchingAuthorRules(collector, includeEmptyRules , cascadeScope++, --cascadeOrder);
388 388
389 m_treeBoundaryCrossingRules.collectTreeBoundaryCrossingRules(element, collec tor, includeEmptyRules); 389 m_treeBoundaryCrossingRules.collectTreeBoundaryCrossingRules(element, collec tor, includeEmptyRules);
390 collector.sortAndTransferMatchedRules(); 390 collector.sortAndTransferMatchedRules();
391 } 391 }
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after
1614 visitor->trace(m_uncommonAttributeRuleSet); 1614 visitor->trace(m_uncommonAttributeRuleSet);
1615 visitor->trace(m_watchedSelectorsRules); 1615 visitor->trace(m_watchedSelectorsRules);
1616 visitor->trace(m_treeBoundaryCrossingRules); 1616 visitor->trace(m_treeBoundaryCrossingRules);
1617 visitor->trace(m_styleSharingLists); 1617 visitor->trace(m_styleSharingLists);
1618 visitor->trace(m_pendingStyleSheets); 1618 visitor->trace(m_pendingStyleSheets);
1619 visitor->trace(m_document); 1619 visitor->trace(m_document);
1620 #endif 1620 #endif
1621 } 1621 }
1622 1622
1623 } // namespace blink 1623 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/ScopedStyleResolver.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698