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

Side by Side Diff: Source/core/css/ElementRuleCollector.cpp

Issue 418163003: Simplify watched selector handling and remove remnants of user stylesheets (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cascade
Patch Set: use includeEmptyRules flag on MatchRequest Created 6 years, 4 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/CSSValueKeywords.in ('k') | Source/core/css/RuntimeCSSEnabled.cpp » ('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) 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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 appendCSSOMWrapperForRule(const_cast<CSSStyleSheet*>(matchedRules[i] .parentStyleSheet()), matchedRules[i].ruleData()->rule()); 246 appendCSSOMWrapperForRule(const_cast<CSSStyleSheet*>(matchedRules[i] .parentStyleSheet()), matchedRules[i].ruleData()->rule());
247 return; 247 return;
248 } 248 }
249 249
250 // Now transfer the set of matched rules over to our list of declarations. 250 // Now transfer the set of matched rules over to our list of declarations.
251 for (unsigned i = 0; i < matchedRules.size(); i++) { 251 for (unsigned i = 0; i < matchedRules.size(); i++) {
252 // FIXME: Matching should not modify the style directly. 252 // FIXME: Matching should not modify the style directly.
253 const RuleData* ruleData = matchedRules[i].ruleData(); 253 const RuleData* ruleData = matchedRules[i].ruleData();
254 if (m_style && ruleData->containsUncommonAttributeSelector()) 254 if (m_style && ruleData->containsUncommonAttributeSelector())
255 m_style->setUnique(); 255 m_style->setUnique();
256 m_result.addMatchedProperties(&ruleData->rule()->properties(), ruleData- >rule(), ruleData->linkMatchType(), ruleData->propertyWhitelistType(m_matchingUA Rules)); 256 m_result.addMatchedProperties(&ruleData->rule()->properties(), ruleData- >linkMatchType(), ruleData->propertyWhitelistType(m_matchingUARules));
257 } 257 }
258 } 258 }
259 259
260 inline bool ElementRuleCollector::ruleMatches(const RuleData& ruleData, const Co ntainerNode* scope, SelectorChecker::ContextFlags contextFlags, SelectorChecker: :MatchResult* result) 260 inline bool ElementRuleCollector::ruleMatches(const RuleData& ruleData, const Co ntainerNode* scope, SelectorChecker::ContextFlags contextFlags, SelectorChecker: :MatchResult* result)
261 { 261 {
262 SelectorChecker selectorChecker(m_context.element()->document(), m_mode); 262 SelectorChecker selectorChecker(m_context.element()->document(), m_mode);
263 SelectorChecker::SelectorCheckingContext context(ruleData.selector(), m_cont ext.element(), SelectorChecker::VisitedMatchEnabled); 263 SelectorChecker::SelectorCheckingContext context(ruleData.selector(), m_cont ext.element(), SelectorChecker::VisitedMatchEnabled);
264 context.elementStyle = m_style.get(); 264 context.elementStyle = m_style.get();
265 context.scope = scope; 265 context.scope = scope;
266 context.pseudoId = m_pseudoStyleRequest.pseudoId; 266 context.pseudoId = m_pseudoStyleRequest.pseudoId;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 // information about "scope". 343 // information about "scope".
344 int firstRuleIndex = -1, lastRuleIndex = -1; 344 int firstRuleIndex = -1, lastRuleIndex = -1;
345 RuleRange ruleRange(firstRuleIndex, lastRuleIndex); 345 RuleRange ruleRange(firstRuleIndex, lastRuleIndex);
346 // FIXME: Verify whether it's ok to ignore CascadeScope here. 346 // FIXME: Verify whether it's ok to ignore CascadeScope here.
347 collectMatchingRules(MatchRequest(ruleSet), ruleRange, SelectorChecker::Defa ultBehavior); 347 collectMatchingRules(MatchRequest(ruleSet), ruleRange, SelectorChecker::Defa ultBehavior);
348 348
349 return m_matchedRules && !m_matchedRules->isEmpty(); 349 return m_matchedRules && !m_matchedRules->isEmpty();
350 } 350 }
351 351
352 } // namespace blink 352 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/RuntimeCSSEnabled.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698