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

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

Issue 1729013002: 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-3: . Created 4 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
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 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 RuleData::RuleData(StyleRule* rule, unsigned selectorIndex, unsigned position, A ddRuleFlags addRuleFlags) 109 RuleData::RuleData(StyleRule* rule, unsigned selectorIndex, unsigned position, A ddRuleFlags addRuleFlags)
110 : m_rule(rule) 110 : m_rule(rule)
111 , m_selectorIndex(selectorIndex) 111 , m_selectorIndex(selectorIndex)
112 , m_isLastInArray(false) 112 , m_isLastInArray(false)
113 , m_position(position) 113 , m_position(position)
114 , m_specificity(selector().specificity()) 114 , m_specificity(selector().specificity())
115 , m_containsUncommonAttributeSelector(blink::containsUncommonAttributeSelect or(selector())) 115 , m_containsUncommonAttributeSelector(blink::containsUncommonAttributeSelect or(selector()))
116 , m_linkMatchType(selector().computeLinkMatchType()) 116 , m_linkMatchType(selector().computeLinkMatchType())
117 , m_hasDocumentSecurityOrigin(addRuleFlags & RuleHasDocumentSecurityOrigin) 117 , m_hasDocumentSecurityOrigin(addRuleFlags & RuleHasDocumentSecurityOrigin)
118 , m_propertyWhitelistType(determinePropertyWhitelistType(addRuleFlags, selec tor())) 118 , m_propertyWhitelist(determinePropertyWhitelistType(addRuleFlags, selector( )))
119 { 119 {
120 SelectorFilter::collectIdentifierHashes(selector(), m_descendantSelectorIden tifierHashes, maximumIdentifierCount); 120 SelectorFilter::collectIdentifierHashes(selector(), m_descendantSelectorIden tifierHashes, maximumIdentifierCount);
121 } 121 }
122 122
123 void RuleSet::addToRuleSet(const AtomicString& key, PendingRuleMap& map, const R uleData& ruleData) 123 void RuleSet::addToRuleSet(const AtomicString& key, PendingRuleMap& map, const R uleData& ruleData)
124 { 124 {
125 OwnPtrWillBeMember<WillBeHeapLinkedStack<RuleData>>& rules = map.add(key, nu llptr).storedValue->value; 125 OwnPtrWillBeMember<WillBeHeapLinkedStack<RuleData>>& rules = map.add(key, nu llptr).storedValue->value;
126 if (!rules) 126 if (!rules)
127 rules = adoptPtrWillBeNoop(new WillBeHeapLinkedStack<RuleData>); 127 rules = adoptPtrWillBeNoop(new WillBeHeapLinkedStack<RuleData>);
128 rules->push(ruleData); 128 rules->push(ruleData);
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 401
402 #ifndef NDEBUG 402 #ifndef NDEBUG
403 void RuleSet::show() const 403 void RuleSet::show() const
404 { 404 {
405 for (const auto& rule: m_allRules) 405 for (const auto& rule: m_allRules)
406 rule.selector().show(); 406 rule.selector().show();
407 } 407 }
408 #endif 408 #endif
409 409
410 } // namespace blink 410 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/RuleSet.h ('k') | third_party/WebKit/Source/core/css/StyleColor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698