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

Side by Side Diff: sky/engine/core/css/resolver/ScopedStyleResolver.cpp

Issue 838863002: Remove SelectorChecker::ContextFlags. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 | « sky/engine/core/css/SelectorChecker.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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2012 Google Inc. All rights reserved. 4 * Copyright (C) 2012 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 for (auto& rule : sheet->contents()->ruleSet().keyframesRules()) { 71 for (auto& rule : sheet->contents()->ruleSet().keyframesRules()) {
72 if (rule->name() == animationName) 72 if (rule->name() == animationName)
73 return rule.get(); 73 return rule.get();
74 } 74 }
75 } 75 }
76 return nullptr; 76 return nullptr;
77 } 77 }
78 78
79 void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& colle ctor, bool includeEmptyRules, CascadeScope cascadeScope, CascadeOrder cascadeOrd er) 79 void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& colle ctor, bool includeEmptyRules, CascadeScope cascadeScope, CascadeOrder cascadeOrd er)
80 { 80 {
81 unsigned contextFlags = SelectorChecker::DefaultBehavior;
82
83 RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange(); 81 RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange();
84 for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) { 82 for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
85 MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet() , includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], i); 83 MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet() , includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], i);
86 collector.collectMatchingRules(matchRequest, ruleRange, static_cast<Sele ctorChecker::ContextFlags>(contextFlags), cascadeScope, cascadeOrder); 84 collector.collectMatchingRules(matchRequest, ruleRange, cascadeScope, ca scadeOrder);
87 } 85 }
88 } 86 }
89 87
90 } // namespace blink 88 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/SelectorChecker.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698