Source/core/css/CSSDefaultStyleSheets.cpp - Issue 165443003: Pass implementation object to supplemental classes by reference

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

Issue 165443003: Pass implementation object to supplemental classes by reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « Source/core/animation/ElementAnimation.cpp ('k') | Source/core/css/CSSFontFace.cpp » ('j') | no next file with comments »

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 r ights reserved.	5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved.

6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>	6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>

7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>	7 * 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/)	8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)

9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.	9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.

10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.	10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.

(...skipping 142 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
153 if (!m_mediaControlsStyleSheet && (element->hasTagName(videoTag) \|\| element- >hasTagName(audioTag))) {	153 if (!m_mediaControlsStyleSheet && (element->hasTagName(videoTag) \|\| element- >hasTagName(audioTag))) {

154 String mediaRules = String(mediaControlsUserAgentStyleSheet, sizeof(medi aControlsUserAgentStyleSheet)) + RenderTheme::theme().extraMediaControlsStyleShe et();	154 String mediaRules = String(mediaControlsUserAgentStyleSheet, sizeof(medi aControlsUserAgentStyleSheet)) + RenderTheme::theme().extraMediaControlsStyleShe et();

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(), printE val());	157 m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(), printE val());

158 changedDefaultStyle = true;	158 changedDefaultStyle = true;

159 }	159 }

160	160

161 // FIXME: This only works because we Force recalc the entire document so the new sheet	161 // FIXME: This only works because we Force recalc the entire document so the new sheet

162 // is loaded for <html> and the correct styles apply to everyone.	162 // is loaded for <html> and the correct styles apply to everyone.

163 if (!m_fullscreenStyleSheet && FullscreenElementStack::isFullScreen(&element ->document())) {	163 if (!m_fullscreenStyleSheet && FullscreenElementStack::isFullScreen(element- >document())) {

164 String fullscreenRules = String(fullscreenUserAgentStyleSheet, sizeof(fu llscreenUserAgentStyleSheet)) + RenderTheme::theme().extraFullScreenStyleSheet() ;	164 String fullscreenRules = String(fullscreenUserAgentStyleSheet, sizeof(fu llscreenUserAgentStyleSheet)) + RenderTheme::theme().extraFullScreenStyleSheet() ;

165 m_fullscreenStyleSheet = parseUASheet(fullscreenRules);	165 m_fullscreenStyleSheet = parseUASheet(fullscreenRules);

166 m_defaultStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEval());	166 m_defaultStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEval());

167 m_defaultQuirksStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEv al());	167 m_defaultQuirksStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEv al());

168 changedDefaultStyle = true;	168 changedDefaultStyle = true;

169 }	169 }

170	170

171 ASSERT(!m_defaultStyle->features().hasIdsInSelectors());	171 ASSERT(!m_defaultStyle->features().hasIdsInSelectors());

172 ASSERT(m_defaultStyle->features().siblingRules.isEmpty());	172 ASSERT(m_defaultStyle->features().siblingRules.isEmpty());

173 }	173 }

174	174

175 void CSSDefaultStyleSheets::trace(Visitor* visitor)	175 void CSSDefaultStyleSheets::trace(Visitor* visitor)

176 {	176 {

177 visitor->trace(m_defaultStyleSheet);	177 visitor->trace(m_defaultStyleSheet);

178 visitor->trace(m_viewportStyleSheet);	178 visitor->trace(m_viewportStyleSheet);

179 visitor->trace(m_quirksStyleSheet);	179 visitor->trace(m_quirksStyleSheet);

180 visitor->trace(m_svgStyleSheet);	180 visitor->trace(m_svgStyleSheet);

181 visitor->trace(m_mediaControlsStyleSheet);	181 visitor->trace(m_mediaControlsStyleSheet);

182 visitor->trace(m_fullscreenStyleSheet);	182 visitor->trace(m_fullscreenStyleSheet);

183 }	183 }

184	184

185 } // namespace WebCore	185 } // namespace WebCore

OLD	NEW