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

Side by Side Diff: Source/core/layout/LayoutTheme.h

Issue 1292593003: Revert "Revert "Reland 2: mac: Use a placeholder string for the family name of the system font." Br… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « Source/core/layout/LayoutTextControlSingleLine.cpp ('k') | Source/core/layout/LayoutThemeMac.h » ('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 * 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 virtual Color platformDefaultCompositionBackgroundColor() const { return def aultCompositionBackgroundColor; } 129 virtual Color platformDefaultCompositionBackgroundColor() const { return def aultCompositionBackgroundColor; }
130 virtual void platformColorsDidChange(); 130 virtual void platformColorsDidChange();
131 131
132 virtual double caretBlinkInterval() const { return 0.5; } 132 virtual double caretBlinkInterval() const { return 0.5; }
133 133
134 // System fonts and colors for CSS. 134 // System fonts and colors for CSS.
135 virtual void systemFont(CSSValueID systemFontID, FontStyle&, FontWeight&, fl oat& fontSize, AtomicString& fontFamily) const = 0; 135 virtual void systemFont(CSSValueID systemFontID, FontStyle&, FontWeight&, fl oat& fontSize, AtomicString& fontFamily) const = 0;
136 void systemFont(CSSValueID systemFontID, FontDescription&); 136 void systemFont(CSSValueID systemFontID, FontDescription&);
137 virtual Color systemColor(CSSValueID) const; 137 virtual Color systemColor(CSSValueID) const;
138 138
139 // Whether the default system font should have its average character width
140 // adjusted to match MS Shell Dlg.
141 virtual bool needsHackForTextControlWithFontFamily(const AtomicString&) cons t { return false; }
142
139 virtual int minimumMenuListSize(const ComputedStyle&) const { return 0; } 143 virtual int minimumMenuListSize(const ComputedStyle&) const { return 0; }
140 144
141 virtual void adjustSliderThumbSize(ComputedStyle&) const; 145 virtual void adjustSliderThumbSize(ComputedStyle&) const;
142 146
143 virtual int popupInternalPaddingLeft(const ComputedStyle&) const { return 0; } 147 virtual int popupInternalPaddingLeft(const ComputedStyle&) const { return 0; }
144 virtual int popupInternalPaddingRight(const ComputedStyle&) const { return 0 ; } 148 virtual int popupInternalPaddingRight(const ComputedStyle&) const { return 0 ; }
145 virtual int popupInternalPaddingTop(const ComputedStyle&) const { return 0; } 149 virtual int popupInternalPaddingTop(const ComputedStyle&) const { return 0; }
146 virtual int popupInternalPaddingBottom(const ComputedStyle&) const { return 0; } 150 virtual int popupInternalPaddingBottom(const ComputedStyle&) const { return 0; }
147 virtual bool popupOptionSupportsTextIndent() const { return false; } 151 virtual bool popupOptionSupportsTextIndent() const { return false; }
148 152
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 static const RGBA32 defaultCompositionBackgroundColor = 0xFFFFDD55; 252 static const RGBA32 defaultCompositionBackgroundColor = 0xFFFFDD55;
249 253
250 #if USE(NEW_THEME) 254 #if USE(NEW_THEME)
251 Theme* m_platformTheme; // The platform-specific theme. 255 Theme* m_platformTheme; // The platform-specific theme.
252 #endif 256 #endif
253 }; 257 };
254 258
255 } // namespace blink 259 } // namespace blink
256 260
257 #endif // LayoutTheme_h 261 #endif // LayoutTheme_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutTextControlSingleLine.cpp ('k') | Source/core/layout/LayoutThemeMac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698