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

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

Issue 2677843002: Change ComputedStyle::setUnique to take bool parameter. (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | third_party/WebKit/Source/core/css/SelectorChecker.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. 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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 return; 333 return;
334 // FIXME: Matching should not modify the style directly. 334 // FIXME: Matching should not modify the style directly.
335 if (!m_style || dynamicPseudo >= FirstInternalPseudoId) 335 if (!m_style || dynamicPseudo >= FirstInternalPseudoId)
336 return; 336 return;
337 if ((dynamicPseudo == PseudoIdBefore || dynamicPseudo == PseudoIdAfter) && 337 if ((dynamicPseudo == PseudoIdBefore || dynamicPseudo == PseudoIdAfter) &&
338 !ruleData.rule()->properties().hasProperty(CSSPropertyContent)) 338 !ruleData.rule()->properties().hasProperty(CSSPropertyContent))
339 return; 339 return;
340 m_style->setHasPseudoStyle(dynamicPseudo); 340 m_style->setHasPseudoStyle(dynamicPseudo);
341 } else { 341 } else {
342 if (m_style && ruleData.containsUncommonAttributeSelector()) 342 if (m_style && ruleData.containsUncommonAttributeSelector())
343 m_style->setUnique(); 343 m_style->setUnique(true);
344 344
345 m_matchedRules.push_back( 345 m_matchedRules.push_back(
346 MatchedRule(&ruleData, result.specificity, cascadeOrder, 346 MatchedRule(&ruleData, result.specificity, cascadeOrder,
347 matchRequest.styleSheetIndex, matchRequest.styleSheet)); 347 matchRequest.styleSheetIndex, matchRequest.styleSheet));
348 } 348 }
349 } 349 }
350 350
351 static inline bool compareRules(const MatchedRule& matchedRule1, 351 static inline bool compareRules(const MatchedRule& matchedRule1,
352 const MatchedRule& matchedRule2) { 352 const MatchedRule& matchedRule2) {
353 unsigned specificity1 = matchedRule1.specificity(); 353 unsigned specificity1 = matchedRule1.specificity();
(...skipping 22 matching lines...) Expand all
376 return !m_matchedRules.isEmpty(); 376 return !m_matchedRules.isEmpty();
377 } 377 }
378 378
379 void ElementRuleCollector::addMatchedRulesToTracker( 379 void ElementRuleCollector::addMatchedRulesToTracker(
380 StyleRuleUsageTracker* tracker) const { 380 StyleRuleUsageTracker* tracker) const {
381 for (auto matchedRule : m_matchedRules) 381 for (auto matchedRule : m_matchedRules)
382 tracker->track(matchedRule.ruleData()->rule()); 382 tracker->track(matchedRule.ruleData()->rule());
383 } 383 }
384 384
385 } // namespace blink 385 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/SelectorChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698