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

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

Issue 181783005: Have Element::ensureMutableInlineStyle() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSViewportRule.cpp ('k') | Source/core/css/FontFace.h » ('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_matchingUAR ules)); 256 m_result.addMatchedProperties(&ruleData->rule()->properties(), ruleData- >rule(), ruleData->linkMatchType(), ruleData->propertyWhitelistType(m_matchingUA Rules));
257 } 257 }
258 } 258 }
259 259
260 inline bool ElementRuleCollector::ruleMatches(const RuleData& ruleData, const Co ntainerNode* scope, SelectorChecker::BehaviorAtBoundary behaviorAtBoundary, Sele ctorChecker::MatchResult* result) 260 inline bool ElementRuleCollector::ruleMatches(const RuleData& ruleData, const Co ntainerNode* scope, SelectorChecker::BehaviorAtBoundary behaviorAtBoundary, Sele ctorChecker::MatchResult* result)
261 { 261 {
262 // Scoped rules can't match because the fast path uses a pool of tag/class/i ds, collected from 262 // Scoped rules can't match because the fast path uses a pool of tag/class/i ds, collected from
263 // elements in that tree and those will never match the host, since it's in a different pool. 263 // elements in that tree and those will never match the host, since it's in a different pool.
264 if (ruleData.hasFastCheckableSelector() && !scope) { 264 if (ruleData.hasFastCheckableSelector() && !scope) {
265 // We know this selector does not include any pseudo elements. 265 // We know this selector does not include any pseudo elements.
266 if (m_pseudoStyleRequest.pseudoId != NOPSEUDO) 266 if (m_pseudoStyleRequest.pseudoId != NOPSEUDO)
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 300
301 void ElementRuleCollector::collectRuleIfMatches(const RuleData& ruleData, Select orChecker::BehaviorAtBoundary behaviorAtBoundary, CascadeScope cascadeScope, Cas cadeOrder cascadeOrder, const MatchRequest& matchRequest, RuleRange& ruleRange) 301 void ElementRuleCollector::collectRuleIfMatches(const RuleData& ruleData, Select orChecker::BehaviorAtBoundary behaviorAtBoundary, CascadeScope cascadeScope, Cas cadeOrder cascadeOrder, const MatchRequest& matchRequest, RuleRange& ruleRange)
302 { 302 {
303 if (m_canUseFastReject && m_selectorFilter.fastRejectSelector<RuleData::maxi mumIdentifierCount>(ruleData.descendantSelectorIdentifierHashes())) 303 if (m_canUseFastReject && m_selectorFilter.fastRejectSelector<RuleData::maxi mumIdentifierCount>(ruleData.descendantSelectorIdentifierHashes()))
304 return; 304 return;
305 305
306 StyleRule* rule = ruleData.rule(); 306 StyleRule* rule = ruleData.rule();
307 SelectorChecker::MatchResult result; 307 SelectorChecker::MatchResult result;
308 if (ruleMatches(ruleData, matchRequest.scope, behaviorAtBoundary, &result)) { 308 if (ruleMatches(ruleData, matchRequest.scope, behaviorAtBoundary, &result)) {
309 // If the rule has no properties to apply, then ignore it in the non-deb ug mode. 309 // If the rule has no properties to apply, then ignore it in the non-deb ug mode.
310 const StylePropertySet* properties = rule->properties(); 310 const StylePropertySet& properties = rule->properties();
311 if (!properties || (properties->isEmpty() && !matchRequest.includeEmptyR ules)) 311 if (properties.isEmpty() && !matchRequest.includeEmptyRules)
312 return; 312 return;
313 // FIXME: Exposing the non-standard getMatchedCSSRules API to web is the only reason this is needed. 313 // FIXME: Exposing the non-standard getMatchedCSSRules API to web is the only reason this is needed.
314 if (m_sameOriginOnly && !ruleData.hasDocumentSecurityOrigin()) 314 if (m_sameOriginOnly && !ruleData.hasDocumentSecurityOrigin())
315 return; 315 return;
316 316
317 PseudoId dynamicPseudo = result.dynamicPseudo; 317 PseudoId dynamicPseudo = result.dynamicPseudo;
318 // If we're matching normal rules, set a pseudo bit if 318 // If we're matching normal rules, set a pseudo bit if
319 // we really just matched a pseudo-element. 319 // we really just matched a pseudo-element.
320 if (dynamicPseudo != NOPSEUDO && m_pseudoStyleRequest.pseudoId == NOPSEU DO) { 320 if (dynamicPseudo != NOPSEUDO && m_pseudoStyleRequest.pseudoId == NOPSEU DO) {
321 if (m_mode == SelectorChecker::CollectingCSSRules || m_mode == Selec torChecker::CollectingStyleRules) 321 if (m_mode == SelectorChecker::CollectingCSSRules || m_mode == Selec torChecker::CollectingStyleRules)
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 // information about "scope". 383 // information about "scope".
384 int firstRuleIndex = -1, lastRuleIndex = -1; 384 int firstRuleIndex = -1, lastRuleIndex = -1;
385 RuleRange ruleRange(firstRuleIndex, lastRuleIndex); 385 RuleRange ruleRange(firstRuleIndex, lastRuleIndex);
386 // FIXME: Verify whether it's ok to ignore CascadeScope here. 386 // FIXME: Verify whether it's ok to ignore CascadeScope here.
387 collectMatchingRules(MatchRequest(ruleSet), ruleRange, SelectorChecker::Stay sWithinTreeScope); 387 collectMatchingRules(MatchRequest(ruleSet), ruleRange, SelectorChecker::Stay sWithinTreeScope);
388 388
389 return m_matchedRules && !m_matchedRules->isEmpty(); 389 return m_matchedRules && !m_matchedRules->isEmpty();
390 } 390 }
391 391
392 } // namespace WebCore 392 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSViewportRule.cpp ('k') | Source/core/css/FontFace.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698