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

Side by Side Diff: Source/platform/fonts/FontDescription.h

Issue 48113009: Move Font related classes to Source/platform/fonts (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix mac export Created 7 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
« no previous file with comments | « Source/platform/fonts/FontCacheKey.h ('k') | Source/platform/fonts/FontDescription.cpp » ('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 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
11 * version 2 of the License, or (at your option) any later version. 11 * version 2 of the License, or (at your option) any later version.
12 * 12 *
13 * This library is distributed in the hope that it will be useful, 13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Library General Public License for more details. 16 * Library General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Library General Public License 18 * You should have received a copy of the GNU Library General Public License
19 * along with this library; see the file COPYING.LIother.m_ If not, write to 19 * along with this library; see the file COPYING.LIother.m_ If not, write to
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21 * Boston, MA 02110-1301, USm_ 21 * Boston, MA 02110-1301, USm_
22 * 22 *
23 */ 23 */
24 24
25 #ifndef FontDescription_h 25 #ifndef FontDescription_h
26 #define FontDescription_h 26 #define FontDescription_h
27 27
28 #include "FontFamilyNames.h" 28 #include "FontFamilyNames.h"
29 #include "core/platform/graphics/FontCacheKey.h" 29 #include "platform/fonts/FontCacheKey.h"
30 #include "core/platform/graphics/FontOrientation.h"
31 #include "core/platform/graphics/FontSmoothingMode.h"
32 #include "core/platform/graphics/FontTraitsMask.h"
33 #include "core/platform/graphics/FontWidthVariant.h"
34 #include "core/platform/graphics/TextRenderingMode.h"
35 #include "platform/fonts/FontFamily.h" 30 #include "platform/fonts/FontFamily.h"
36 #include "platform/fonts/FontFeatureSettings.h" 31 #include "platform/fonts/FontFeatureSettings.h"
32 #include "platform/fonts/FontOrientation.h"
33 #include "platform/fonts/FontSmoothingMode.h"
34 #include "platform/fonts/FontTraitsMask.h"
35 #include "platform/fonts/FontWidthVariant.h"
36 #include "platform/fonts/TextRenderingMode.h"
37 #include "platform/text/NonCJKGlyphOrientation.h" 37 #include "platform/text/NonCJKGlyphOrientation.h"
38 #include "wtf/MathExtras.h" 38 #include "wtf/MathExtras.h"
39 39
40 #include "wtf/RefPtr.h" 40 #include "wtf/RefPtr.h"
41 41
42 namespace WebCore { 42 namespace WebCore {
43 43
44 enum FontWeight { 44 enum FontWeight {
45 FontWeight100, 45 FontWeight100,
46 FontWeight200, 46 FontWeight200,
(...skipping 11 matching lines...) Expand all
58 enum FontItalic { 58 enum FontItalic {
59 FontItalicOff = 0, 59 FontItalicOff = 0,
60 FontItalicOn = 1 60 FontItalicOn = 1
61 }; 61 };
62 62
63 enum FontSmallCaps { 63 enum FontSmallCaps {
64 FontSmallCapsOff = 0, 64 FontSmallCapsOff = 0,
65 FontSmallCapsOn = 1 65 FontSmallCapsOn = 1
66 }; 66 };
67 67
68 class FontDescription { 68 class PLATFORM_EXPORT FontDescription {
69 public: 69 public:
70 enum GenericFamilyType { NoFamily, StandardFamily, SerifFamily, SansSerifFam ily, 70 enum GenericFamilyType { NoFamily, StandardFamily, SerifFamily, SansSerifFam ily,
71 MonospaceFamily, CursiveFamily, FantasyFamily, Pict ographFamily }; 71 MonospaceFamily, CursiveFamily, FantasyFamily, Pict ographFamily };
72 72
73 enum Kerning { AutoKerning, NormalKerning, NoneKerning }; 73 enum Kerning { AutoKerning, NormalKerning, NoneKerning };
74 74
75 enum LigaturesState { NormalLigaturesState, DisabledLigaturesState, EnabledL igaturesState }; 75 enum LigaturesState { NormalLigaturesState, DisabledLigaturesState, EnabledL igaturesState };
76 76
77 FontDescription() 77 FontDescription()
78 : m_specifiedSize(0) 78 : m_specifiedSize(0)
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 && m_orientation == other.m_orientation 224 && m_orientation == other.m_orientation
225 && m_nonCJKGlyphOrientation == other.m_nonCJKGlyphOrientation 225 && m_nonCJKGlyphOrientation == other.m_nonCJKGlyphOrientation
226 && m_widthVariant == other.m_widthVariant 226 && m_widthVariant == other.m_widthVariant
227 && m_script == other.m_script 227 && m_script == other.m_script
228 && m_featureSettings == other.m_featureSettings; 228 && m_featureSettings == other.m_featureSettings;
229 } 229 }
230 230
231 } 231 }
232 232
233 #endif 233 #endif
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontCacheKey.h ('k') | Source/platform/fonts/FontDescription.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698