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

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

Issue 258023004: Removed unused matching behavior. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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/css/resolver/StyleResolver.h ('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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 } 637 }
638 638
639 bool needsCollection = false; 639 bool needsCollection = false;
640 CSSDefaultStyleSheets::instance().ensureDefaultStyleSheetsForElement(element , needsCollection); 640 CSSDefaultStyleSheets::instance().ensureDefaultStyleSheetsForElement(element , needsCollection);
641 if (needsCollection) 641 if (needsCollection)
642 collectFeatures(); 642 collectFeatures();
643 643
644 { 644 {
645 ElementRuleCollector collector(state.elementContext(), m_selectorFilter, state.style()); 645 ElementRuleCollector collector(state.elementContext(), m_selectorFilter, state.style());
646 646
647 if (matchingBehavior == MatchOnlyUserAgentRules) 647 matchAllRules(state, collector, matchingBehavior != MatchAllRulesExcludi ngSMIL);
648 matchUARules(collector);
649 else
650 matchAllRules(state, collector, matchingBehavior != MatchAllRulesExc ludingSMIL);
651 648
652 applyMatchedProperties(state, collector.matchedResult()); 649 applyMatchedProperties(state, collector.matchedResult());
653 650
654 addContentAttrValuesToFeatures(state.contentAttrValues(), m_features); 651 addContentAttrValuesToFeatures(state.contentAttrValues(), m_features);
655 } 652 }
656 { 653 {
657 StyleAdjuster adjuster(state.cachedUAStyle(), m_document.inQuirksMode()) ; 654 StyleAdjuster adjuster(state.cachedUAStyle(), m_document.inQuirksMode()) ;
658 adjuster.adjustRenderStyle(state.style(), state.parentStyle(), element); 655 adjuster.adjustRenderStyle(state.style(), state.parentStyle(), element);
659 } 656 }
660 657
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
1363 visitor->trace(m_keyframesRuleMap); 1360 visitor->trace(m_keyframesRuleMap);
1364 visitor->trace(m_viewportDependentMediaQueryResults); 1361 visitor->trace(m_viewportDependentMediaQueryResults);
1365 visitor->trace(m_viewportStyleResolver); 1362 visitor->trace(m_viewportStyleResolver);
1366 visitor->trace(m_siblingRuleSet); 1363 visitor->trace(m_siblingRuleSet);
1367 visitor->trace(m_uncommonAttributeRuleSet); 1364 visitor->trace(m_uncommonAttributeRuleSet);
1368 visitor->trace(m_watchedSelectorsRules); 1365 visitor->trace(m_watchedSelectorsRules);
1369 visitor->trace(m_treeBoundaryCrossingRules); 1366 visitor->trace(m_treeBoundaryCrossingRules);
1370 } 1367 }
1371 1368
1372 } // namespace WebCore 1369 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolver.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698