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

Side by Side Diff: Source/core/rendering/RenderThemeChromiumFontProvider.cpp

Issue 20253002: core/rendering: Include wtf files using "wtf/foo.h" form. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixes Created 7 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/rendering/RenderThemeChromiumFontProvider.h" 27 #include "core/rendering/RenderThemeChromiumFontProvider.h"
28 28
29 #include <wtf/StdLibExtras.h> 29 #include "wtf/StdLibExtras.h"
30 #include <wtf/text/WTFString.h> 30 #include "wtf/text/WTFString.h"
31 31
32 namespace WebCore { 32 namespace WebCore {
33 33
34 // The default variable-width font size. We use this as the default font 34 // The default variable-width font size. We use this as the default font
35 // size for the "system font", and as a base size (which we then shrink) for 35 // size for the "system font", and as a base size (which we then shrink) for
36 // form control fonts. 36 // form control fonts.
37 // static 37 // static
38 float RenderThemeChromiumFontProvider::s_defaultFontSize = 16.0; 38 float RenderThemeChromiumFontProvider::s_defaultFontSize = 16.0;
39 39
40 // We aim to match IE here. 40 // We aim to match IE here.
41 // -IE uses a font based on the encoding as the default font for form controls. 41 // -IE uses a font based on the encoding as the default font for form controls.
42 // -Gecko uses MS Shell Dlg (actually calls GetStockObject(DEFAULT_GUI_FONT), 42 // -Gecko uses MS Shell Dlg (actually calls GetStockObject(DEFAULT_GUI_FONT),
43 // which returns MS Shell Dlg) 43 // which returns MS Shell Dlg)
44 // -Safari uses Lucida Grande. 44 // -Safari uses Lucida Grande.
45 // 45 //
46 // FIXME: The only case where we know we don't match IE is for ANSI encodings. 46 // FIXME: The only case where we know we don't match IE is for ANSI encodings.
47 // IE uses MS Shell Dlg there, which we render incorrectly at certain pixel 47 // IE uses MS Shell Dlg there, which we render incorrectly at certain pixel
48 // sizes (e.g. 15px). So, for now we just use Arial. 48 // sizes (e.g. 15px). So, for now we just use Arial.
49 const String& RenderThemeChromiumFontProvider::defaultGUIFont() 49 const String& RenderThemeChromiumFontProvider::defaultGUIFont()
50 { 50 {
51 DEFINE_STATIC_LOCAL(String, fontFace, (ASCIILiteral("Arial"))); 51 DEFINE_STATIC_LOCAL(String, fontFace, (ASCIILiteral("Arial")));
52 return fontFace; 52 return fontFace;
53 } 53 }
54 54
55 } // namespace WebCore 55 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTextControl.cpp ('k') | Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698