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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutThemeFontProvider.cpp

Issue 1541793002: Remove config.h inclusion from third_party/WebKit/Source/core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
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"
27 #include "core/layout/LayoutThemeFontProvider.h" 26 #include "core/layout/LayoutThemeFontProvider.h"
28 27
29 #include "wtf/StdLibExtras.h" 28 #include "wtf/StdLibExtras.h"
30 #include "wtf/text/WTFString.h" 29 #include "wtf/text/WTFString.h"
31 30
32 namespace blink { 31 namespace blink {
33 32
34 // The default variable-width font size. We use this as the default font 33 // 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 34 // size for the "system font", and as a base size (which we then shrink) for
36 // form control fonts. 35 // form control fonts.
37 // static 36 // static
38 float LayoutThemeFontProvider::s_defaultFontSize = 16.0; 37 float LayoutThemeFontProvider::s_defaultFontSize = 16.0;
39 38
40 // We aim to match IE here. 39 // We aim to match IE here.
41 // -IE uses a font based on the encoding as the default font for form controls. 40 // -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), 41 // -Gecko uses MS Shell Dlg (actually calls GetStockObject(DEFAULT_GUI_FONT),
43 // which returns MS Shell Dlg) 42 // which returns MS Shell Dlg)
44 // -Safari uses Lucida Grande. 43 // -Safari uses Lucida Grande.
45 // 44 //
46 // FIXME: The only case where we know we don't match IE is for ANSI encodings. 45 // 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 46 // 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. 47 // sizes (e.g. 15px). So, for now we just use Arial.
49 const AtomicString& LayoutThemeFontProvider::defaultGUIFont() 48 const AtomicString& LayoutThemeFontProvider::defaultGUIFont()
50 { 49 {
51 DEFINE_STATIC_LOCAL(const AtomicString, fontFace, ("Arial", AtomicString::Co nstructFromLiteral)); 50 DEFINE_STATIC_LOCAL(const AtomicString, fontFace, ("Arial", AtomicString::Co nstructFromLiteral));
52 return fontFace; 51 return fontFace;
53 } 52 }
54 53
55 } // namespace blink 54 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698