Source/core/css/resolver/FontBuilder.h - Issue 1024473004: Do not treat '0' as 'none' for font-size-adjust

Side by Side Diff: Source/core/css/resolver/FontBuilder.h

Issue 1024473004: Do not treat '0' as 'none' for font-size-adjust (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 9 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

« Source/core/animation/StringKeyframe.cpp ('K') | « Source/core/animation/css/CSSAnimatableValueFactory.cpp ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | Source/platform/fonts/FontDescription.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.	3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.

4 * Copyright (C) 2013 Google Inc. All rights reserved.	4 * Copyright (C) 2013 Google Inc. All rights reserved.

5 *	5 *

6 * This library is free software; you can redistribute it and/or	6 * This library is free software; you can redistribute it and/or

7 * modify it under the terms of the GNU Library General Public	7 * modify it under the terms of the GNU Library General Public

8 * License as published by the Free Software Foundation; either	8 * License as published by the Free Software Foundation; either

9 * version 2 of the License, or (at your option) any later version.	9 * version 2 of the License, or (at your option) any later version.

10 *	10 *

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 void createFont(PassRefPtrWillBeRawPtr<FontSelector>, LayoutStyle&);	69 void createFont(PassRefPtrWillBeRawPtr<FontSelector>, LayoutStyle&);

70	70

71 void createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector>, LayoutStyle &);	71 void createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector>, LayoutStyle &);

72	72

73 bool fontDirty() const { return m_flags; }	73 bool fontDirty() const { return m_flags; }

74	74

75 static FontDescription::FamilyDescription initialFamilyDescription() { retur n FontDescription::FamilyDescription(initialGenericFamily()); }	75 static FontDescription::FamilyDescription initialFamilyDescription() { retur n FontDescription::FamilyDescription(initialGenericFamily()); }

76 static FontFeatureSettings* initialFeatureSettings() { return nullptr; }	76 static FontFeatureSettings* initialFeatureSettings() { return nullptr; }

77 static FontDescription::GenericFamilyType initialGenericFamily() { return Fo ntDescription::StandardFamily; }	77 static FontDescription::GenericFamilyType initialGenericFamily() { return Fo ntDescription::StandardFamily; }

78 static FontDescription::Size initialSize() { return FontDescription::Size(Fo ntSize::initialKeywordSize(), 0.0f, false); }	78 static FontDescription::Size initialSize() { return FontDescription::Size(Fo ntSize::initialKeywordSize(), 0.0f, false); }

79 static float initialSizeAdjust() { return 0; }	79 static float initialSizeAdjust() { return FontDescription::SizeAdjustNone; }

80 static TextRenderingMode initialTextRendering() { return AutoTextRendering; }	80 static TextRenderingMode initialTextRendering() { return AutoTextRendering; }

81 static FontVariant initialVariant() { return FontVariantNormal; }	81 static FontVariant initialVariant() { return FontVariantNormal; }

82 static FontDescription::VariantLigatures initialVariantLigatures() { return FontDescription::VariantLigatures(); }	82 static FontDescription::VariantLigatures initialVariantLigatures() { return FontDescription::VariantLigatures(); }

83 static FontStyle initialStyle() { return FontStyleNormal; }	83 static FontStyle initialStyle() { return FontStyleNormal; }

84 static FontDescription::Kerning initialKerning() { return FontDescription::A utoKerning; }	84 static FontDescription::Kerning initialKerning() { return FontDescription::A utoKerning; }

85 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; }	85 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; }

86 static FontStretch initialStretch() { return FontStretchNormal; }	86 static FontStretch initialStretch() { return FontStretchNormal; }

87 static FontWeight initialWeight() { return FontWeightNormal; }	87 static FontWeight initialWeight() { return FontWeightNormal; }

88	88

89 private:	89 private:

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
124	124

125 void set(PropertySetFlag flag) { m_flags \|= (1 << unsigned(flag)); }	125 void set(PropertySetFlag flag) { m_flags \|= (1 << unsigned(flag)); }

126 bool isSet(PropertySetFlag flag) const { return m_flags & (1 << unsigned(fla g)); }	126 bool isSet(PropertySetFlag flag) const { return m_flags & (1 << unsigned(fla g)); }

127	127

128 unsigned m_flags;	128 unsigned m_flags;

129 };	129 };

130	130

131 }	131 }

132	132

133 #endif	133 #endif

OLD	NEW