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

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

Issue 2857503002: Revert "Verify that constant vectors aren't invalidated during iteration." (Closed)
Patch Set: 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
« no previous file with comments | « third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp ('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 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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 const MediaQueryEvaluator& medium, 325 const MediaQueryEvaluator& medium,
326 AddRuleFlags add_rule_flags) { 326 AddRuleFlags add_rule_flags) {
327 TRACE_EVENT0("blink", "RuleSet::addRulesFromSheet"); 327 TRACE_EVENT0("blink", "RuleSet::addRulesFromSheet");
328 328
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.
336 CHECK_EQ(import_rules.data(), sheet->ImportRules().data());
337 if (import_rule->GetStyleSheet() && 335 if (import_rule->GetStyleSheet() &&
338 (!import_rule->MediaQueries() || 336 (!import_rule->MediaQueries() ||
339 medium.Eval(*import_rule->MediaQueries(), 337 medium.Eval(*import_rule->MediaQueries(),
340 &features_.ViewportDependentMediaQueryResults(), 338 &features_.ViewportDependentMediaQueryResults(),
341 &features_.DeviceDependentMediaQueryResults()))) 339 &features_.DeviceDependentMediaQueryResults())))
342 AddRulesFromSheet(import_rule->GetStyleSheet(), medium, add_rule_flags); 340 AddRulesFromSheet(import_rule->GetStyleSheet(), medium, add_rule_flags);
343 } 341 }
344 342
345 AddChildRules(sheet->ChildRules(), medium, add_rule_flags); 343 AddChildRules(sheet->ChildRules(), medium, add_rule_flags);
346 } 344 }
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 } 431 }
434 432
435 #ifndef NDEBUG 433 #ifndef NDEBUG
436 void RuleSet::Show() const { 434 void RuleSet::Show() const {
437 for (const auto& rule : all_rules_) 435 for (const auto& rule : all_rules_)
438 rule.Selector().Show(); 436 rule.Selector().Show();
439 } 437 }
440 #endif 438 #endif
441 439
442 } // namespace blink 440 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698