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

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

Issue 2469143002: Make siblingRules and uncommonAttributeRules private. (Closed)
Patch Set: Compile fixes Created 4 years, 1 month 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 | « no previous file | third_party/WebKit/Source/core/css/CSSGlobalRuleSet.cpp » ('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 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 (isHTMLVideoElement(element) || isHTMLAudioElement(element))) { 152 (isHTMLVideoElement(element) || isHTMLAudioElement(element))) {
153 String mediaRules = loadResourceAsASCIIString("mediaControls.css") + 153 String mediaRules = loadResourceAsASCIIString("mediaControls.css") +
154 LayoutTheme::theme().extraMediaControlsStyleSheet(); 154 LayoutTheme::theme().extraMediaControlsStyleSheet();
155 m_mediaControlsStyleSheet = parseUASheet(mediaRules); 155 m_mediaControlsStyleSheet = parseUASheet(mediaRules);
156 m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval()); 156 m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval());
157 m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(), 157 m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(),
158 printEval()); 158 printEval());
159 changedDefaultStyle = true; 159 changedDefaultStyle = true;
160 } 160 }
161 161
162 ASSERT(!m_defaultStyle->features().hasIdsInSelectors()); 162 DCHECK(!m_defaultStyle->features().hasIdsInSelectors());
163 ASSERT(m_defaultStyle->features().siblingRules.isEmpty()); 163 DCHECK(!m_defaultStyle->features().usesSiblingRules());
164 return changedDefaultStyle; 164 return changedDefaultStyle;
165 } 165 }
166 166
167 void CSSDefaultStyleSheets::ensureDefaultStyleSheetForFullscreen() { 167 void CSSDefaultStyleSheets::ensureDefaultStyleSheetForFullscreen() {
168 if (m_fullscreenStyleSheet) 168 if (m_fullscreenStyleSheet)
169 return; 169 return;
170 170
171 String fullscreenRules = loadResourceAsASCIIString("fullscreen.css") + 171 String fullscreenRules = loadResourceAsASCIIString("fullscreen.css") +
172 LayoutTheme::theme().extraFullscreenStyleSheet(); 172 LayoutTheme::theme().extraFullscreenStyleSheet();
173 m_fullscreenStyleSheet = parseUASheet(fullscreenRules); 173 m_fullscreenStyleSheet = parseUASheet(fullscreenRules);
(...skipping 11 matching lines...) Expand all
185 visitor->trace(m_televisionViewportStyleSheet); 185 visitor->trace(m_televisionViewportStyleSheet);
186 visitor->trace(m_xhtmlMobileProfileStyleSheet); 186 visitor->trace(m_xhtmlMobileProfileStyleSheet);
187 visitor->trace(m_quirksStyleSheet); 187 visitor->trace(m_quirksStyleSheet);
188 visitor->trace(m_svgStyleSheet); 188 visitor->trace(m_svgStyleSheet);
189 visitor->trace(m_mathmlStyleSheet); 189 visitor->trace(m_mathmlStyleSheet);
190 visitor->trace(m_mediaControlsStyleSheet); 190 visitor->trace(m_mediaControlsStyleSheet);
191 visitor->trace(m_fullscreenStyleSheet); 191 visitor->trace(m_fullscreenStyleSheet);
192 } 192 }
193 193
194 } // namespace blink 194 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/CSSGlobalRuleSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698