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

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

Issue 219243006: Revert "Removed unused includes from UnicodeIcu.h" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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
« no previous file with comments | « no previous file | Source/platform/fonts/GenericFontFamilySettings.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 * 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
(...skipping 22 matching lines...) Expand all
33 #include "platform/fonts/FontSmoothingMode.h" 33 #include "platform/fonts/FontSmoothingMode.h"
34 #include "platform/fonts/FontTraits.h" 34 #include "platform/fonts/FontTraits.h"
35 #include "platform/fonts/FontWidthVariant.h" 35 #include "platform/fonts/FontWidthVariant.h"
36 #include "platform/fonts/TextRenderingMode.h" 36 #include "platform/fonts/TextRenderingMode.h"
37 #include "platform/fonts/TypesettingFeatures.h" 37 #include "platform/fonts/TypesettingFeatures.h"
38 #include "platform/text/NonCJKGlyphOrientation.h" 38 #include "platform/text/NonCJKGlyphOrientation.h"
39 #include "wtf/MathExtras.h" 39 #include "wtf/MathExtras.h"
40 40
41 #include "wtf/RefPtr.h" 41 #include "wtf/RefPtr.h"
42 42
43 #include <unicode/uscript.h>
44
45 namespace WebCore { 43 namespace WebCore {
46 44
47 class PLATFORM_EXPORT FontDescription { 45 class PLATFORM_EXPORT FontDescription {
48 public: 46 public:
49 enum GenericFamilyType { NoFamily, StandardFamily, SerifFamily, SansSerifFam ily, 47 enum GenericFamilyType { NoFamily, StandardFamily, SerifFamily, SansSerifFam ily,
50 MonospaceFamily, CursiveFamily, FantasyFamily, Pict ographFamily }; 48 MonospaceFamily, CursiveFamily, FantasyFamily, Pict ographFamily };
51 49
52 enum Kerning { AutoKerning, NormalKerning, NoneKerning }; 50 enum Kerning { AutoKerning, NormalKerning, NoneKerning };
53 51
54 enum LigaturesState { NormalLigaturesState, DisabledLigaturesState, EnabledL igaturesState }; 52 enum LigaturesState { NormalLigaturesState, DisabledLigaturesState, EnabledL igaturesState };
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 && m_script == other.m_script 248 && m_script == other.m_script
251 && m_syntheticBold == other.m_syntheticBold 249 && m_syntheticBold == other.m_syntheticBold
252 && m_syntheticItalic == other.m_syntheticItalic 250 && m_syntheticItalic == other.m_syntheticItalic
253 && m_featureSettings == other.m_featureSettings 251 && m_featureSettings == other.m_featureSettings
254 && m_subpixelTextPosition == other.m_subpixelTextPosition; 252 && m_subpixelTextPosition == other.m_subpixelTextPosition;
255 } 253 }
256 254
257 } 255 }
258 256
259 #endif 257 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/platform/fonts/GenericFontFamilySettings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698