OLD | NEW |
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 m_mathmlStyleSheet = parseUASheet(loadResourceAsASCIIString("mathml.css")); | 143 m_mathmlStyleSheet = parseUASheet(loadResourceAsASCIIString("mathml.css")); |
144 m_defaultStyle->addRulesFromSheet(mathmlStyleSheet(), screenEval()); | 144 m_defaultStyle->addRulesFromSheet(mathmlStyleSheet(), screenEval()); |
145 m_defaultPrintStyle->addRulesFromSheet(mathmlStyleSheet(), printEval()); | 145 m_defaultPrintStyle->addRulesFromSheet(mathmlStyleSheet(), printEval()); |
146 changedDefaultStyle = true; | 146 changedDefaultStyle = true; |
147 } | 147 } |
148 | 148 |
149 // FIXME: We should assert that this sheet only contains rules for <video> and | 149 // FIXME: We should assert that this sheet only contains rules for <video> and |
150 // <audio>. | 150 // <audio>. |
151 if (!m_mediaControlsStyleSheet && | 151 if (!m_mediaControlsStyleSheet && |
152 (isHTMLVideoElement(element) || isHTMLAudioElement(element))) { | 152 (isHTMLVideoElement(element) || isHTMLAudioElement(element))) { |
153 String mediaRules = loadResourceAsASCIIString( | 153 String mediaRules = loadResourceAsASCIIString("mediaControlsNew.css") + |
154 RuntimeEnabledFeatures::newMediaPlaybackUiEnabled() | |
155 ? "mediaControlsNew.css" | |
156 : "mediaControls.css") + | |
157 LayoutTheme::theme().extraMediaControlsStyleSheet(); | 154 LayoutTheme::theme().extraMediaControlsStyleSheet(); |
158 m_mediaControlsStyleSheet = parseUASheet(mediaRules); | 155 m_mediaControlsStyleSheet = parseUASheet(mediaRules); |
159 m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval()); | 156 m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval()); |
160 m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(), | 157 m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(), |
161 printEval()); | 158 printEval()); |
162 changedDefaultStyle = true; | 159 changedDefaultStyle = true; |
163 } | 160 } |
164 | 161 |
165 ASSERT(!m_defaultStyle->features().hasIdsInSelectors()); | 162 ASSERT(!m_defaultStyle->features().hasIdsInSelectors()); |
166 ASSERT(m_defaultStyle->features().siblingRules.isEmpty()); | 163 ASSERT(m_defaultStyle->features().siblingRules.isEmpty()); |
(...skipping 20 matching lines...) Expand all Loading... |
187 visitor->trace(m_televisionViewportStyleSheet); | 184 visitor->trace(m_televisionViewportStyleSheet); |
188 visitor->trace(m_xhtmlMobileProfileStyleSheet); | 185 visitor->trace(m_xhtmlMobileProfileStyleSheet); |
189 visitor->trace(m_quirksStyleSheet); | 186 visitor->trace(m_quirksStyleSheet); |
190 visitor->trace(m_svgStyleSheet); | 187 visitor->trace(m_svgStyleSheet); |
191 visitor->trace(m_mathmlStyleSheet); | 188 visitor->trace(m_mathmlStyleSheet); |
192 visitor->trace(m_mediaControlsStyleSheet); | 189 visitor->trace(m_mediaControlsStyleSheet); |
193 visitor->trace(m_fullscreenStyleSheet); | 190 visitor->trace(m_fullscreenStyleSheet); |
194 } | 191 } |
195 | 192 |
196 } // namespace blink | 193 } // namespace blink |
OLD | NEW |