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

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

Issue 1731583003: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-2: . Created 4 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
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 static bool checkPageSelectorComponents(const CSSSelector* selector, bool isLeft Page, bool isFirstPage, const String& pageName) 87 static bool checkPageSelectorComponents(const CSSSelector* selector, bool isLeft Page, bool isFirstPage, const String& pageName)
88 { 88 {
89 for (const CSSSelector* component = selector; component; component = compone nt->tagHistory()) { 89 for (const CSSSelector* component = selector; component; component = compone nt->tagHistory()) {
90 if (component->match() == CSSSelector::Tag) { 90 if (component->match() == CSSSelector::Tag) {
91 const AtomicString& localName = component->tagQName().localName(); 91 const AtomicString& localName = component->tagQName().localName();
92 if (localName != starAtom && localName != pageName) 92 if (localName != starAtom && localName != pageName)
93 return false; 93 return false;
94 } 94 }
95 95
96 CSSSelector::PseudoType pseudoType = component->pseudoType(); 96 CSSSelector::PseudoType pseudoType = component->getPseudoType();
97 if ((pseudoType == CSSSelector::PseudoLeftPage && !isLeftPage) 97 if ((pseudoType == CSSSelector::PseudoLeftPage && !isLeftPage)
98 || (pseudoType == CSSSelector::PseudoRightPage && isLeftPage) 98 || (pseudoType == CSSSelector::PseudoRightPage && isLeftPage)
99 || (pseudoType == CSSSelector::PseudoFirstPage && !isFirstPage)) 99 || (pseudoType == CSSSelector::PseudoFirstPage && !isFirstPage))
100 { 100 {
101 return false; 101 return false;
102 } 102 }
103 } 103 }
104 return true; 104 return true;
105 } 105 }
106 106
107 void PageRuleCollector::matchPageRulesForList(WillBeHeapVector<RawPtrWillBeMembe r<StyleRulePage>>& matchedRules, const WillBeHeapVector<RawPtrWillBeMember<Style RulePage>>& rules, bool isLeftPage, bool isFirstPage, const String& pageName) 107 void PageRuleCollector::matchPageRulesForList(WillBeHeapVector<RawPtrWillBeMembe r<StyleRulePage>>& matchedRules, const WillBeHeapVector<RawPtrWillBeMember<Style RulePage>>& rules, bool isLeftPage, bool isFirstPage, const String& pageName)
108 { 108 {
109 for (unsigned i = 0; i < rules.size(); ++i) { 109 for (unsigned i = 0; i < rules.size(); ++i) {
110 StyleRulePage* rule = rules[i]; 110 StyleRulePage* rule = rules[i];
111 111
112 if (!checkPageSelectorComponents(rule->selector(), isLeftPage, isFirstPa ge, pageName)) 112 if (!checkPageSelectorComponents(rule->selector(), isLeftPage, isFirstPa ge, pageName))
113 continue; 113 continue;
114 114
115 // If the rule has no properties to apply, then ignore it. 115 // If the rule has no properties to apply, then ignore it.
116 const StylePropertySet& properties = rule->properties(); 116 const StylePropertySet& properties = rule->properties();
117 if (properties.isEmpty()) 117 if (properties.isEmpty())
118 continue; 118 continue;
119 119
120 // Add this rule to our list of matched rules. 120 // Add this rule to our list of matched rules.
121 matchedRules.append(rule); 121 matchedRules.append(rule);
122 } 122 }
123 } 123 }
124 124
125 } // namespace blink 125 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSSelectorList.cpp ('k') | third_party/WebKit/Source/core/css/RuleFeature.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698