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

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

Issue 2392343005: Reflow comments in core/css (Closed)
Patch Set: Revert clang-format Created 4 years, 2 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 r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All
6 * rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * 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/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 11 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 12 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
11 * Copyright (C) 2012 Google Inc. All rights reserved. 13 * Copyright (C) 2012 Google Inc. All rights reserved.
12 * 14 *
13 * This library is free software; you can redistribute it and/or 15 * This library is free software; you can redistribute it and/or
14 * modify it under the terms of the GNU Library General Public 16 * modify it under the terms of the GNU Library General Public
15 * License as published by the Free Software Foundation; either 17 * License as published by the Free Software Foundation; either
16 * version 2 of the License, or (at your option) any later version. 18 * version 2 of the License, or (at your option) any later version.
17 * 19 *
18 * This library is distributed in the hope that it will be useful, 20 * This library is distributed in the hope that it will be useful,
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 165
164 // FIXME: We should assert that the sheet only styles MathML elements. 166 // FIXME: We should assert that the sheet only styles MathML elements.
165 if (element.namespaceURI() == MathMLNames::mathmlNamespaceURI && 167 if (element.namespaceURI() == MathMLNames::mathmlNamespaceURI &&
166 !m_mathmlStyleSheet) { 168 !m_mathmlStyleSheet) {
167 m_mathmlStyleSheet = parseUASheet(loadResourceAsASCIIString("mathml.css")); 169 m_mathmlStyleSheet = parseUASheet(loadResourceAsASCIIString("mathml.css"));
168 m_defaultStyle->addRulesFromSheet(mathmlStyleSheet(), screenEval()); 170 m_defaultStyle->addRulesFromSheet(mathmlStyleSheet(), screenEval());
169 m_defaultPrintStyle->addRulesFromSheet(mathmlStyleSheet(), printEval()); 171 m_defaultPrintStyle->addRulesFromSheet(mathmlStyleSheet(), printEval());
170 changedDefaultStyle = true; 172 changedDefaultStyle = true;
171 } 173 }
172 174
173 // FIXME: We should assert that this sheet only contains rules for <video> and <audio>. 175 // FIXME: We should assert that this sheet only contains rules for <video> and
176 // <audio>.
174 if (!m_mediaControlsStyleSheet && 177 if (!m_mediaControlsStyleSheet &&
175 (isHTMLVideoElement(element) || isHTMLAudioElement(element))) { 178 (isHTMLVideoElement(element) || isHTMLAudioElement(element))) {
176 String mediaRules = loadResourceAsASCIIString( 179 String mediaRules = loadResourceAsASCIIString(
177 RuntimeEnabledFeatures::newMediaPlaybackUiEnabled() 180 RuntimeEnabledFeatures::newMediaPlaybackUiEnabled()
178 ? "mediaControlsNew.css" 181 ? "mediaControlsNew.css"
179 : "mediaControls.css") + 182 : "mediaControls.css") +
180 LayoutTheme::theme().extraMediaControlsStyleSheet(); 183 LayoutTheme::theme().extraMediaControlsStyleSheet();
181 m_mediaControlsStyleSheet = parseUASheet(mediaRules); 184 m_mediaControlsStyleSheet = parseUASheet(mediaRules);
182 m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval()); 185 m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval());
183 m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(), 186 m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(),
(...skipping 28 matching lines...) Expand all
212 visitor->trace(m_mobileViewportStyleSheet); 215 visitor->trace(m_mobileViewportStyleSheet);
213 visitor->trace(m_televisionViewportStyleSheet); 216 visitor->trace(m_televisionViewportStyleSheet);
214 visitor->trace(m_quirksStyleSheet); 217 visitor->trace(m_quirksStyleSheet);
215 visitor->trace(m_svgStyleSheet); 218 visitor->trace(m_svgStyleSheet);
216 visitor->trace(m_mathmlStyleSheet); 219 visitor->trace(m_mathmlStyleSheet);
217 visitor->trace(m_mediaControlsStyleSheet); 220 visitor->trace(m_mediaControlsStyleSheet);
218 visitor->trace(m_fullscreenStyleSheet); 221 visitor->trace(m_fullscreenStyleSheet);
219 } 222 }
220 223
221 } // namespace blink 224 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h ('k') | third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698