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

Side by Side Diff: sky/engine/core/css/RuleSet.cpp

Issue 807703003: Remove @media rules. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/RuleSet.h ('k') | sky/engine/core/css/StyleRule.h » ('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 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 ensurePendingRules(); // So that m_fontFaceRules.shrinkToFit() gets called. 142 ensurePendingRules(); // So that m_fontFaceRules.shrinkToFit() gets called.
143 m_fontFaceRules.append(rule); 143 m_fontFaceRules.append(rule);
144 } 144 }
145 145
146 void RuleSet::addKeyframesRule(StyleRuleKeyframes* rule) 146 void RuleSet::addKeyframesRule(StyleRuleKeyframes* rule)
147 { 147 {
148 ensurePendingRules(); // So that m_keyframesRules.shrinkToFit() gets called. 148 ensurePendingRules(); // So that m_keyframesRules.shrinkToFit() gets called.
149 m_keyframesRules.append(rule); 149 m_keyframesRules.append(rule);
150 } 150 }
151 151
152 void RuleSet::addChildRules(const Vector<RefPtr<StyleRuleBase> >& rules, const M ediaQueryEvaluator& medium, AddRuleFlags addRuleFlags) 152 void RuleSet::addChildRules(const Vector<RefPtr<StyleRuleBase> >& rules, AddRule Flags addRuleFlags)
153 { 153 {
154 for (unsigned i = 0; i < rules.size(); ++i) { 154 for (unsigned i = 0; i < rules.size(); ++i) {
155 StyleRuleBase* rule = rules[i].get(); 155 StyleRuleBase* rule = rules[i].get();
156 156
157 if (rule->isStyleRule()) { 157 if (rule->isStyleRule()) {
158 StyleRule* styleRule = toStyleRule(rule); 158 StyleRule* styleRule = toStyleRule(rule);
159 159
160 const CSSSelectorList& selectorList = styleRule->selectorList(); 160 const CSSSelectorList& selectorList = styleRule->selectorList();
161 for (size_t selectorIndex = 0; selectorIndex != kNotFound; selectorI ndex = selectorList.indexOfNextSelectorAfter(selectorIndex)) 161 for (size_t selectorIndex = 0; selectorIndex != kNotFound; selectorI ndex = selectorList.indexOfNextSelectorAfter(selectorIndex))
162 addRule(styleRule, selectorIndex, addRuleFlags); 162 addRule(styleRule, selectorIndex, addRuleFlags);
163 } else if (rule->isMediaRule()) {
164 StyleRuleMedia* mediaRule = toStyleRuleMedia(rule);
165 if ((!mediaRule->mediaQueries() || medium.eval(mediaRule->mediaQueri es(), &m_viewportDependentMediaQueryResults)))
166 addChildRules(mediaRule->childRules(), medium, addRuleFlags);
167 } else if (rule->isFontFaceRule()) { 163 } else if (rule->isFontFaceRule()) {
168 addFontFaceRule(toStyleRuleFontFace(rule)); 164 addFontFaceRule(toStyleRuleFontFace(rule));
169 } else if (rule->isKeyframesRule()) { 165 } else if (rule->isKeyframesRule()) {
170 addKeyframesRule(toStyleRuleKeyframes(rule)); 166 addKeyframesRule(toStyleRuleKeyframes(rule));
171 } else if (rule->isSupportsRule() && toStyleRuleSupports(rule)->conditio nIsSupported()) { 167 } else if (rule->isSupportsRule() && toStyleRuleSupports(rule)->conditio nIsSupported()) {
172 addChildRules(toStyleRuleSupports(rule)->childRules(), medium, addRu leFlags); 168 addChildRules(toStyleRuleSupports(rule)->childRules(), addRuleFlags) ;
173 } 169 }
174 } 170 }
175 } 171 }
176 172
177 void RuleSet::addRulesFromSheet(StyleSheetContents* sheet, const MediaQueryEvalu ator& medium, AddRuleFlags addRuleFlags) 173 void RuleSet::addRulesFromSheet(StyleSheetContents* sheet, AddRuleFlags addRuleF lags)
178 { 174 {
179 TRACE_EVENT0("blink", "RuleSet::addRulesFromSheet"); 175 TRACE_EVENT0("blink", "RuleSet::addRulesFromSheet");
180 ASSERT(sheet); 176 ASSERT(sheet);
181 addRuleFlags = static_cast<AddRuleFlags>(addRuleFlags | RuleCanUseFastCheckS elector); 177 addRuleFlags = static_cast<AddRuleFlags>(addRuleFlags | RuleCanUseFastCheckS elector);
182 addChildRules(sheet->childRules(), medium, addRuleFlags); 178 addChildRules(sheet->childRules(), addRuleFlags);
183 } 179 }
184 180
185 void RuleSet::addStyleRule(StyleRule* rule, AddRuleFlags addRuleFlags) 181 void RuleSet::addStyleRule(StyleRule* rule, AddRuleFlags addRuleFlags)
186 { 182 {
187 for (size_t selectorIndex = 0; selectorIndex != kNotFound; selectorIndex = r ule->selectorList().indexOfNextSelectorAfter(selectorIndex)) 183 for (size_t selectorIndex = 0; selectorIndex != kNotFound; selectorIndex = r ule->selectorList().indexOfNextSelectorAfter(selectorIndex))
188 addRule(rule, selectorIndex, addRuleFlags); 184 addRule(rule, selectorIndex, addRuleFlags);
189 } 185 }
190 186
191 void RuleSet::compactPendingRules(PendingRuleMap& pendingMap, CompactRuleMap& co mpactMap) 187 void RuleSet::compactPendingRules(PendingRuleMap& pendingMap, CompactRuleMap& co mpactMap)
192 { 188 {
(...skipping 28 matching lines...) Expand all
221 217
222 #ifndef NDEBUG 218 #ifndef NDEBUG
223 void RuleSet::show() 219 void RuleSet::show()
224 { 220 {
225 for (Vector<RuleData>::const_iterator it = m_allRules.begin(); it != m_allRu les.end(); ++it) 221 for (Vector<RuleData>::const_iterator it = m_allRules.begin(); it != m_allRu les.end(); ++it)
226 it->selector().show(); 222 it->selector().show();
227 } 223 }
228 #endif 224 #endif
229 225
230 } // namespace blink 226 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/RuleSet.h ('k') | sky/engine/core/css/StyleRule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698