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

Side by Side Diff: Source/platform/fonts/win/FontPlatformDataWin.h

Issue 138273018: Use synthetic bold/italic terminology consistently (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Computer, Inc. 2 * Copyright (C) 2006, 2007 Apple Computer, Inc.
3 * Copyright (c) 2006, 2007, 2008, 2009, Google Inc. All rights reserved. 3 * Copyright (c) 2006, 2007, 2008, 2009, Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 // set everything to NULL. 69 // set everything to NULL.
70 FontPlatformData(WTF::HashTableDeletedValueType); 70 FontPlatformData(WTF::HashTableDeletedValueType);
71 FontPlatformData(); 71 FontPlatformData();
72 #if ENABLE(GDI_FONTS_ON_WINDOWS) 72 #if ENABLE(GDI_FONTS_ON_WINDOWS)
73 // This constructor takes ownership of the HFONT 73 // This constructor takes ownership of the HFONT
74 FontPlatformData(HFONT, float size, FontOrientation); 74 FontPlatformData(HFONT, float size, FontOrientation);
75 #endif 75 #endif
76 FontPlatformData(float size, bool bold, bool oblique); 76 FontPlatformData(float size, bool bold, bool oblique);
77 FontPlatformData(const FontPlatformData&); 77 FontPlatformData(const FontPlatformData&);
78 FontPlatformData(const FontPlatformData&, float textSize); 78 FontPlatformData(const FontPlatformData&, float textSize);
79 FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, b ool fakeBold, bool fakeItalic, FontOrientation = Horizontal, bool useSubpixelPos itioning = defaultUseSubpixelPositioning()); 79 FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, b ool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, bool useS ubpixelPositioning = defaultUseSubpixelPositioning());
80 80
81 void setupPaint(SkPaint*, GraphicsContext* = 0) const; 81 void setupPaint(SkPaint*, GraphicsContext* = 0) const;
82 82
83 FontPlatformData& operator=(const FontPlatformData&); 83 FontPlatformData& operator=(const FontPlatformData&);
84 84
85 bool isHashTableDeletedValue() const { return m_isHashTableDeletedValue; } 85 bool isHashTableDeletedValue() const { return m_isHashTableDeletedValue; }
86 86
87 ~FontPlatformData(); 87 ~FontPlatformData();
88 88
89 bool isFixedPitch() const; 89 bool isFixedPitch() const;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 { 162 {
163 } 163 }
164 164
165 HFONT m_hfont; 165 HFONT m_hfont;
166 }; 166 };
167 167
168 RefPtr<RefCountedHFONT> m_font; 168 RefPtr<RefCountedHFONT> m_font;
169 #endif // !USE(HARFBUZZ) 169 #endif // !USE(HARFBUZZ)
170 float m_textSize; // Point size of the font in pixels. 170 float m_textSize; // Point size of the font in pixels.
171 FontOrientation m_orientation; 171 FontOrientation m_orientation;
172 bool m_fakeBold; 172 bool m_syntheticBold;
173 bool m_fakeItalic; 173 bool m_syntheticItalic;
174 174
175 RefPtr<SkTypeface> m_typeface; 175 RefPtr<SkTypeface> m_typeface;
176 176
177 #if USE(HARFBUZZ) 177 #if USE(HARFBUZZ)
178 mutable RefPtr<HarfBuzzFace> m_harfBuzzFace; 178 mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;
179 #else 179 #else
180 mutable SCRIPT_CACHE m_scriptCache; 180 mutable SCRIPT_CACHE m_scriptCache;
181 mutable OwnPtr<SCRIPT_FONTPROPERTIES> m_scriptFontProperties; 181 mutable OwnPtr<SCRIPT_FONTPROPERTIES> m_scriptFontProperties;
182 #endif 182 #endif
183 183
184 bool m_isHashTableDeletedValue; 184 bool m_isHashTableDeletedValue;
185 bool m_useSubpixelPositioning; 185 bool m_useSubpixelPositioning;
186 }; 186 };
187 187
188 } // WebCore 188 } // WebCore
189 189
190 #endif // FontPlatformDataChromiumWin_h 190 #endif // FontPlatformDataChromiumWin_h
OLDNEW
« no previous file with comments | « Source/platform/fonts/skia/FontPlatformDataSkia.cpp ('k') | Source/platform/fonts/win/FontPlatformDataWin.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698