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

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

Issue 2873123002: Put unqualified pseudos into the more specific rulesets. (Closed)
Patch Set: comments. 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 LayoutTheme::GetTheme().ExtraDefaultStyleSheet(); 83 LayoutTheme::GetTheme().ExtraDefaultStyleSheet();
84 default_style_sheet_ = ParseUASheet(default_rules); 84 default_style_sheet_ = ParseUASheet(default_rules);
85 default_style_->AddRulesFromSheet(DefaultStyleSheet(), ScreenEval()); 85 default_style_->AddRulesFromSheet(DefaultStyleSheet(), ScreenEval());
86 default_print_style_->AddRulesFromSheet(DefaultStyleSheet(), PrintEval()); 86 default_print_style_->AddRulesFromSheet(DefaultStyleSheet(), PrintEval());
87 87
88 // Quirks-mode rules. 88 // Quirks-mode rules.
89 String quirks_rules = LoadResourceAsASCIIString("quirks.css") + 89 String quirks_rules = LoadResourceAsASCIIString("quirks.css") +
90 LayoutTheme::GetTheme().ExtraQuirksStyleSheet(); 90 LayoutTheme::GetTheme().ExtraQuirksStyleSheet();
91 quirks_style_sheet_ = ParseUASheet(quirks_rules); 91 quirks_style_sheet_ = ParseUASheet(quirks_rules);
92 default_quirks_style_->AddRulesFromSheet(QuirksStyleSheet(), ScreenEval()); 92 default_quirks_style_->AddRulesFromSheet(QuirksStyleSheet(), ScreenEval());
93
94 #if DCHECK_IS_ON()
95 default_style_->CompactRulesIfNeeded();
96 default_print_style_->CompactRulesIfNeeded();
97 default_quirks_style_->CompactRulesIfNeeded();
98 DCHECK(default_style_->UniversalRules()->IsEmpty());
99 DCHECK(default_print_style_->UniversalRules()->IsEmpty());
100 DCHECK(default_quirks_style_->UniversalRules()->IsEmpty());
101 #endif
93 } 102 }
94 103
95 RuleSet* CSSDefaultStyleSheets::DefaultViewSourceStyle() { 104 RuleSet* CSSDefaultStyleSheets::DefaultViewSourceStyle() {
96 if (!default_view_source_style_) { 105 if (!default_view_source_style_) {
97 default_view_source_style_ = RuleSet::Create(); 106 default_view_source_style_ = RuleSet::Create();
98 // Loaded stylesheet is leaked on purpose. 107 // Loaded stylesheet is leaked on purpose.
99 StyleSheetContents* stylesheet = 108 StyleSheetContents* stylesheet =
100 ParseUASheet(LoadResourceAsASCIIString("view-source.css")); 109 ParseUASheet(LoadResourceAsASCIIString("view-source.css"));
101 default_view_source_style_->AddRulesFromSheet(stylesheet, ScreenEval()); 110 default_view_source_style_->AddRulesFromSheet(stylesheet, ScreenEval());
102 } 111 }
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 visitor->Trace(television_viewport_style_sheet_); 195 visitor->Trace(television_viewport_style_sheet_);
187 visitor->Trace(xhtml_mobile_profile_style_sheet_); 196 visitor->Trace(xhtml_mobile_profile_style_sheet_);
188 visitor->Trace(quirks_style_sheet_); 197 visitor->Trace(quirks_style_sheet_);
189 visitor->Trace(svg_style_sheet_); 198 visitor->Trace(svg_style_sheet_);
190 visitor->Trace(mathml_style_sheet_); 199 visitor->Trace(mathml_style_sheet_);
191 visitor->Trace(media_controls_style_sheet_); 200 visitor->Trace(media_controls_style_sheet_);
192 visitor->Trace(fullscreen_style_sheet_); 201 visitor->Trace(fullscreen_style_sheet_);
193 } 202 }
194 203
195 } // namespace blink 204 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/RuleSet.cpp » ('j') | third_party/WebKit/Source/core/css/RuleSet.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698