third_party/WebKit/Source/platform/fonts/FontDescription.h - Issue 1891613002: Revert of Add OpenTypeCapsSupport class

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

Issue 1891613002: Revert of Add OpenTypeCapsSupport class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@caseMapHbBufferFillerLand

Patch Set: Created 4 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

« no previous file with comments | « third_party/WebKit/Source/platform/blink_platform_unittests.isolate ('k') | third_party/WebKit/Source/platform/fonts/opentype/OpenTypeCapsSupport.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 class PLATFORM_EXPORT FontDescription {	50 class PLATFORM_EXPORT FontDescription {

51 USING_FAST_MALLOC(FontDescription);	51 USING_FAST_MALLOC(FontDescription);

52 public:	52 public:

53 enum GenericFamilyType { NoFamily, StandardFamily, SerifFamily, SansSerifFam ily,	53 enum GenericFamilyType { NoFamily, StandardFamily, SerifFamily, SansSerifFam ily,

54 MonospaceFamily, CursiveFamily, FantasyFamily, Pict ographFamily };	54 MonospaceFamily, CursiveFamily, FantasyFamily, Pict ographFamily };

55	55

56 enum Kerning { AutoKerning, NormalKerning, NoneKerning };	56 enum Kerning { AutoKerning, NormalKerning, NoneKerning };

57	57

58 enum LigaturesState { NormalLigaturesState, DisabledLigaturesState, EnabledL igaturesState };	58 enum LigaturesState { NormalLigaturesState, DisabledLigaturesState, EnabledL igaturesState };

59	59

60 enum FontVariantCaps { CapsNormal, SmallCaps, AllSmallCaps, PetiteCaps, AllP etiteCaps, Unicase, TitlingCaps };

61

62 FontDescription()	60 FontDescription()

63 : m_specifiedSize(0)	61 : m_specifiedSize(0)

64 , m_computedSize(0)	62 , m_computedSize(0)

65 , m_adjustedSize(0)	63 , m_adjustedSize(0)

66 , m_sizeAdjust(FontSizeAdjustNone)	64 , m_sizeAdjust(FontSizeAdjustNone)

67 , m_letterSpacing(0)	65 , m_letterSpacing(0)

68 , m_wordSpacing(0)	66 , m_wordSpacing(0)

69 {	67 {

70 m_fieldsAsUnsigned[0] = 0;	68 m_fieldsAsUnsigned[0] = 0;

71 m_fieldsAsUnsigned[1] = 0;	69 m_fieldsAsUnsigned[1] = 0;

(...skipping 237 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
309 && m_letterSpacing == other.m_letterSpacing	307 && m_letterSpacing == other.m_letterSpacing

310 && m_wordSpacing == other.m_wordSpacing	308 && m_wordSpacing == other.m_wordSpacing

311 && m_fieldsAsUnsigned[0] == other.m_fieldsAsUnsigned[0]	309 && m_fieldsAsUnsigned[0] == other.m_fieldsAsUnsigned[0]

312 && m_fieldsAsUnsigned[1] == other.m_fieldsAsUnsigned[1]	310 && m_fieldsAsUnsigned[1] == other.m_fieldsAsUnsigned[1]

313 && m_featureSettings == other.m_featureSettings;	311 && m_featureSettings == other.m_featureSettings;

314 }	312 }

315	313

316 } // namespace blink	314 } // namespace blink

317	315

318 #endif	316 #endif

OLD	NEW