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

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

Issue 1312703002: Should not ASSERT what we know will fail. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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 | « LayoutTests/fast/css/long-selector-list-assert-expected.txt ('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 * (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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 : m_rule(rule) 109 : m_rule(rule)
110 , m_selectorIndex(selectorIndex) 110 , m_selectorIndex(selectorIndex)
111 , m_isLastInArray(false) 111 , m_isLastInArray(false)
112 , m_position(position) 112 , m_position(position)
113 , m_specificity(selector().specificity()) 113 , m_specificity(selector().specificity())
114 , m_containsUncommonAttributeSelector(blink::containsUncommonAttributeSelect or(selector())) 114 , m_containsUncommonAttributeSelector(blink::containsUncommonAttributeSelect or(selector()))
115 , m_linkMatchType(selector().computeLinkMatchType()) 115 , m_linkMatchType(selector().computeLinkMatchType())
116 , m_hasDocumentSecurityOrigin(addRuleFlags & RuleHasDocumentSecurityOrigin) 116 , m_hasDocumentSecurityOrigin(addRuleFlags & RuleHasDocumentSecurityOrigin)
117 , m_propertyWhitelistType(determinePropertyWhitelistType(addRuleFlags, selec tor())) 117 , m_propertyWhitelistType(determinePropertyWhitelistType(addRuleFlags, selec tor()))
118 { 118 {
119 ASSERT(m_position == position);
120 ASSERT(m_selectorIndex == selectorIndex);
121 SelectorFilter::collectIdentifierHashes(selector(), m_descendantSelectorIden tifierHashes, maximumIdentifierCount); 119 SelectorFilter::collectIdentifierHashes(selector(), m_descendantSelectorIden tifierHashes, maximumIdentifierCount);
122 } 120 }
123 121
124 void RuleSet::addToRuleSet(const AtomicString& key, PendingRuleMap& map, const R uleData& ruleData) 122 void RuleSet::addToRuleSet(const AtomicString& key, PendingRuleMap& map, const R uleData& ruleData)
125 { 123 {
126 OwnPtrWillBeMember<WillBeHeapLinkedStack<RuleData>>& rules = map.add(key, nu llptr).storedValue->value; 124 OwnPtrWillBeMember<WillBeHeapLinkedStack<RuleData>>& rules = map.add(key, nu llptr).storedValue->value;
127 if (!rules) 125 if (!rules)
128 rules = adoptPtrWillBeNoop(new WillBeHeapLinkedStack<RuleData>); 126 rules = adoptPtrWillBeNoop(new WillBeHeapLinkedStack<RuleData>);
129 rules->push(ruleData); 127 rules->push(ruleData);
130 } 128 }
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 394
397 #ifndef NDEBUG 395 #ifndef NDEBUG
398 void RuleSet::show() 396 void RuleSet::show()
399 { 397 {
400 for (const auto& rule: m_allRules) 398 for (const auto& rule: m_allRules)
401 rule.selector().show(); 399 rule.selector().show();
402 } 400 }
403 #endif 401 #endif
404 402
405 } // namespace blink 403 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/long-selector-list-assert-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698