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

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

Issue 2837023005: Move MediaQuery classes off BlinkGC heap (Closed)
Patch Set: fix Created 3 years, 7 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 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 MinimalRuleData(style_rule, selector_index, add_rule_flags)); 298 MinimalRuleData(style_rule, selector_index, add_rule_flags));
299 } else { 299 } else {
300 AddRule(style_rule, selector_index, add_rule_flags); 300 AddRule(style_rule, selector_index, add_rule_flags);
301 } 301 }
302 } 302 }
303 } else if (rule->IsPageRule()) { 303 } else if (rule->IsPageRule()) {
304 AddPageRule(ToStyleRulePage(rule)); 304 AddPageRule(ToStyleRulePage(rule));
305 } else if (rule->IsMediaRule()) { 305 } else if (rule->IsMediaRule()) {
306 StyleRuleMedia* media_rule = ToStyleRuleMedia(rule); 306 StyleRuleMedia* media_rule = ToStyleRuleMedia(rule);
307 if (!media_rule->MediaQueries() || 307 if (!media_rule->MediaQueries() ||
308 medium.Eval(media_rule->MediaQueries(), 308 medium.Eval(*media_rule->MediaQueries(),
309 &features_.ViewportDependentMediaQueryResults(), 309 &features_.ViewportDependentMediaQueryResults(),
310 &features_.DeviceDependentMediaQueryResults())) 310 &features_.DeviceDependentMediaQueryResults()))
311 AddChildRules(media_rule->ChildRules(), medium, add_rule_flags); 311 AddChildRules(media_rule->ChildRules(), medium, add_rule_flags);
312 } else if (rule->IsFontFaceRule()) { 312 } else if (rule->IsFontFaceRule()) {
313 AddFontFaceRule(ToStyleRuleFontFace(rule)); 313 AddFontFaceRule(ToStyleRuleFontFace(rule));
314 } else if (rule->IsKeyframesRule()) { 314 } else if (rule->IsKeyframesRule()) {
315 AddKeyframesRule(ToStyleRuleKeyframes(rule)); 315 AddKeyframesRule(ToStyleRuleKeyframes(rule));
316 } else if (rule->IsSupportsRule() && 316 } else if (rule->IsSupportsRule() &&
317 ToStyleRuleSupports(rule)->ConditionIsSupported()) { 317 ToStyleRuleSupports(rule)->ConditionIsSupported()) {
318 AddChildRules(ToStyleRuleSupports(rule)->ChildRules(), medium, 318 AddChildRules(ToStyleRuleSupports(rule)->ChildRules(), medium,
(...skipping 10 matching lines...) Expand all
329 DCHECK(sheet); 329 DCHECK(sheet);
330 330
331 const HeapVector<Member<StyleRuleImport>>& import_rules = 331 const HeapVector<Member<StyleRuleImport>>& import_rules =
332 sheet->ImportRules(); 332 sheet->ImportRules();
333 for (unsigned i = 0; i < import_rules.size(); ++i) { 333 for (unsigned i = 0; i < import_rules.size(); ++i) {
334 StyleRuleImport* import_rule = import_rules[i].Get(); 334 StyleRuleImport* import_rule = import_rules[i].Get();
335 // TODO(sof): CHECK() added for crbug.com/699269 diagnosis, remove sooner. 335 // TODO(sof): CHECK() added for crbug.com/699269 diagnosis, remove sooner.
336 CHECK_EQ(import_rules.data(), sheet->ImportRules().data()); 336 CHECK_EQ(import_rules.data(), sheet->ImportRules().data());
337 if (import_rule->GetStyleSheet() && 337 if (import_rule->GetStyleSheet() &&
338 (!import_rule->MediaQueries() || 338 (!import_rule->MediaQueries() ||
339 medium.Eval(import_rule->MediaQueries(), 339 medium.Eval(*import_rule->MediaQueries(),
340 &features_.ViewportDependentMediaQueryResults(), 340 &features_.ViewportDependentMediaQueryResults(),
341 &features_.DeviceDependentMediaQueryResults()))) 341 &features_.DeviceDependentMediaQueryResults())))
342 AddRulesFromSheet(import_rule->GetStyleSheet(), medium, add_rule_flags); 342 AddRulesFromSheet(import_rule->GetStyleSheet(), medium, add_rule_flags);
343 } 343 }
344 344
345 AddChildRules(sheet->ChildRules(), medium, add_rule_flags); 345 AddChildRules(sheet->ChildRules(), medium, add_rule_flags);
346 } 346 }
347 347
348 void RuleSet::AddStyleRule(StyleRule* rule, AddRuleFlags add_rule_flags) { 348 void RuleSet::AddStyleRule(StyleRule* rule, AddRuleFlags add_rule_flags) {
349 for (size_t selector_index = 0; selector_index != kNotFound; 349 for (size_t selector_index = 0; selector_index != kNotFound;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 } 433 }
434 434
435 #ifndef NDEBUG 435 #ifndef NDEBUG
436 void RuleSet::Show() const { 436 void RuleSet::Show() const {
437 for (const auto& rule : all_rules_) 437 for (const auto& rule : all_rules_)
438 rule.Selector().Show(); 438 rule.Selector().Show();
439 } 439 }
440 #endif 440 #endif
441 441
442 } // namespace blink 442 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698