Source/core/rendering/RenderTheme.h - Issue 677103002: Expand system font values during property parsing.

Side by Side Diff: Source/core/rendering/RenderTheme.h

Issue 677103002: Expand system font values during property parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: OVERRIDE -> override, Allow CSSValueNone in systemFont() Created 6 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

« Source/core/css/StylePropertyShorthandCustom.cpp ('K') | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/rendering/RenderTheme.cpp » ('j') | Source/core/rendering/RenderTheme.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * This file is part of the theme implementation for form controls in WebCore.	2 * This file is part of the theme implementation for form controls in WebCore.

3 *	3 *

4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.	4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.

5 *	5 *

6 * This library is free software; you can redistribute it and/or	6 * This library is free software; you can redistribute it and/or

7 * modify it under the terms of the GNU Library General Public	7 * modify it under the terms of the GNU Library General Public

8 * License as published by the Free Software Foundation; either	8 * License as published by the Free Software Foundation; either

9 * version 2 of the License, or (at your option) any later version.	9 * version 2 of the License, or (at your option) any later version.

10 *	10 *

(...skipping 120 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 virtual Color platformFocusRingColor() const { return Color(0, 0, 0); }	131 virtual Color platformFocusRingColor() const { return Color(0, 0, 0); }

132 void setCustomFocusRingColor(const Color&);	132 void setCustomFocusRingColor(const Color&);

133 static Color tapHighlightColor();	133 static Color tapHighlightColor();

134 virtual Color platformTapHighlightColor() const { return RenderTheme::defaul tTapHighlightColor; }	134 virtual Color platformTapHighlightColor() const { return RenderTheme::defaul tTapHighlightColor; }

135 virtual Color platformDefaultCompositionBackgroundColor() const { return def aultCompositionBackgroundColor; }	135 virtual Color platformDefaultCompositionBackgroundColor() const { return def aultCompositionBackgroundColor; }

136 virtual void platformColorsDidChange();	136 virtual void platformColorsDidChange();

137	137

138 virtual double caretBlinkInterval() const { return 0.5; }	138 virtual double caretBlinkInterval() const { return 0.5; }

139	139

140 // System fonts and colors for CSS.	140 // System fonts and colors for CSS.

141 virtual void systemFont(CSSValueID, FontDescription&) const = 0;	141 virtual void systemFont(CSSValueID systemFontID, FontStyle&, FontWeight&, fl oat& fontSize, AtomicString& fontFamily) const = 0;

	142 void systemFont(CSSValueID systemFontID, FontDescription&);

142 virtual Color systemColor(CSSValueID) const;	143 virtual Color systemColor(CSSValueID) const;

143	144

144 virtual int minimumMenuListSize(RenderStyle*) const { return 0; }	145 virtual int minimumMenuListSize(RenderStyle*) const { return 0; }

145	146

146 virtual void adjustSliderThumbSize(RenderStyle, Element) const;	147 virtual void adjustSliderThumbSize(RenderStyle, Element) const;

147	148

148 virtual int popupInternalPaddingLeft(RenderStyle*) const { return 0; }	149 virtual int popupInternalPaddingLeft(RenderStyle*) const { return 0; }

149 virtual int popupInternalPaddingRight(RenderStyle*) const { return 0; }	150 virtual int popupInternalPaddingRight(RenderStyle*) const { return 0; }

150 virtual int popupInternalPaddingTop(RenderStyle*) const { return 0; }	151 virtual int popupInternalPaddingTop(RenderStyle*) const { return 0; }

151 virtual int popupInternalPaddingBottom(RenderStyle*) const { return 0; }	152 virtual int popupInternalPaddingBottom(RenderStyle*) const { return 0; }

(...skipping 154 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
306 static const RGBA32 defaultCompositionBackgroundColor = 0xFFFFDD55;	307 static const RGBA32 defaultCompositionBackgroundColor = 0xFFFFDD55;

307	308

308 #if USE(NEW_THEME)	309 #if USE(NEW_THEME)

309 Theme* m_platformTheme; // The platform-specific theme.	310 Theme* m_platformTheme; // The platform-specific theme.

310 #endif	311 #endif

311 };	312 };

312	313

313 } // namespace blink	314 } // namespace blink

314	315

315 #endif // RenderTheme_h	316 #endif // RenderTheme_h

OLD	NEW