Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h - Issue 553203002: Merge 181492 "[DirectWrite] Disable subpixel font positioning fo..."

Side by Side Diff: Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h

Issue 553203002: Merge 181492 "[DirectWrite] Disable subpixel font positioning fo..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2062/

Patch Set: Created 6 years, 3 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

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved.	2 * Copyright (c) 2006, 2007, 2008, 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 are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 FontOrientation orientation() const { return m_orientation; }	78 FontOrientation orientation() const { return m_orientation; }

79 void setOrientation(FontOrientation orientation) { m_orientation = orientati on; }	79 void setOrientation(FontOrientation orientation) { m_orientation = orientati on; }

80 void setSyntheticBold(bool syntheticBold) { m_syntheticBold = syntheticBold; }	80 void setSyntheticBold(bool syntheticBold) { m_syntheticBold = syntheticBold; }

81 void setSyntheticItalic(bool syntheticItalic) { m_syntheticItalic = syntheti cItalic; }	81 void setSyntheticItalic(bool syntheticItalic) { m_syntheticItalic = syntheti cItalic; }

82 bool operator==(const FontPlatformData&) const;	82 bool operator==(const FontPlatformData&) const;

83 FontPlatformData& operator=(const FontPlatformData&);	83 FontPlatformData& operator=(const FontPlatformData&);

84 bool isHashTableDeletedValue() const { return m_isHashTableDeletedValue; }	84 bool isHashTableDeletedValue() const { return m_isHashTableDeletedValue; }

85 #if OS(WIN)	85 #if OS(WIN)

86 void setMinSizeForAntiAlias(unsigned size) { m_minSizeForAntiAlias = size; }	86 void setMinSizeForAntiAlias(unsigned size) { m_minSizeForAntiAlias = size; }

87 unsigned minSizeForAntiAlias() const { return m_minSizeForAntiAlias; }	87 unsigned minSizeForAntiAlias() const { return m_minSizeForAntiAlias; }

	88 void setMinSizeForSubpixel(float size) { m_minSizeForSubpixel = size; }

	89 float minSizeForSubpixel() const { return m_minSizeForSubpixel; }

88 void setHinting(SkPaint::Hinting style)	90 void setHinting(SkPaint::Hinting style)

89 {	91 {

90 m_style.useAutoHint = 0;	92 m_style.useAutoHint = 0;

91 m_style.hintStyle = style;	93 m_style.hintStyle = style;

92 }	94 }

93 #endif	95 #endif

94	96

95 #if ENABLE(OPENTYPE_VERTICAL)	97 #if ENABLE(OPENTYPE_VERTICAL)

96 PassRefPtr<OpenTypeVerticalData> verticalData() const;	98 PassRefPtr<OpenTypeVerticalData> verticalData() const;

97 PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;	99 PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;

(...skipping 29 matching lines...) Expand all Loading...
127 bool m_syntheticBold;	129 bool m_syntheticBold;

128 bool m_syntheticItalic;	130 bool m_syntheticItalic;

129 FontOrientation m_orientation;	131 FontOrientation m_orientation;

130 FontRenderStyle m_style;	132 FontRenderStyle m_style;

131 mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;	133 mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;

132 bool m_isHashTableDeletedValue;	134 bool m_isHashTableDeletedValue;

133 #if OS(WIN)	135 #if OS(WIN)

134 int m_paintTextFlags;	136 int m_paintTextFlags;

135 bool m_useSubpixelPositioning;	137 bool m_useSubpixelPositioning;

136 unsigned m_minSizeForAntiAlias;	138 unsigned m_minSizeForAntiAlias;

	139 float m_minSizeForSubpixel;

137 #endif	140 #endif

138 };	141 };

139	142

140 } // namespace WebCore	143 } // namespace WebCore

141	144

142 #endif // ifdef FontPlatformDataHarfBuzz_h	145 #endif // ifdef FontPlatformDataHarfBuzz_h

OLD	NEW