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

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

Issue 697473005: Pass indication of locally created typeface to SkCreateTypefaceFromCTFont (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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/FontPlatformData.cpp » ('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) 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // from the 0 one (created with the empty constructor), so we can't just 73 // from the 0 one (created with the empty constructor), so we can't just
74 // set everything to 0. 74 // set everything to 0.
75 FontPlatformData(WTF::HashTableDeletedValueType); 75 FontPlatformData(WTF::HashTableDeletedValueType);
76 FontPlatformData(); 76 FontPlatformData();
77 FontPlatformData(const FontPlatformData&); 77 FontPlatformData(const FontPlatformData&);
78 FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontO rientation = Horizontal, FontWidthVariant = RegularWidth); 78 FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontO rientation = Horizontal, FontWidthVariant = RegularWidth);
79 FontPlatformData(const FontPlatformData& src, float textSize); 79 FontPlatformData(const FontPlatformData& src, float textSize);
80 #if OS(MACOSX) 80 #if OS(MACOSX)
81 FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool synth eticItalic = false, 81 FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool synth eticItalic = false,
82 FontOrientation = Horizontal, FontWidthVariant = RegularWid th); 82 FontOrientation = Horizontal, FontWidthVariant = RegularWid th);
83 FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOb lique, FontOrientation, FontWidthVariant); 83 FontPlatformData(CGFontRef, bool localFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant);
84 #else 84 #else
85 FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, b ool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, bool subp ixelTextPosition = defaultUseSubpixelPositioning()); 85 FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, b ool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, bool subp ixelTextPosition = defaultUseSubpixelPositioning());
86 #endif 86 #endif
87 ~FontPlatformData(); 87 ~FontPlatformData();
88 88
89 #if OS(MACOSX) 89 #if OS(MACOSX)
90 NSFont* font() const { return m_font; } 90 NSFont* font() const { return m_font; }
91 void setFont(NSFont*); 91 void setFont(NSFont*);
92 92
93 CGFontRef cgFont() const { return m_cgFont.get(); } 93 CGFontRef cgFont() const { return m_cgFont.get(); }
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 bool m_isColorBitmapFont; 186 bool m_isColorBitmapFont;
187 bool m_isCompositeFontReference; 187 bool m_isCompositeFontReference;
188 #endif 188 #endif
189 FontWidthVariant m_widthVariant; 189 FontWidthVariant m_widthVariant;
190 private: 190 private:
191 #if OS(MACOSX) 191 #if OS(MACOSX)
192 NSFont* m_font; 192 NSFont* m_font;
193 RetainPtr<CGFontRef> m_cgFont; 193 RetainPtr<CGFontRef> m_cgFont;
194 mutable RetainPtr<CTFontRef> m_CTFont; 194 mutable RetainPtr<CTFontRef> m_CTFont;
195 RefPtr<MemoryActivatedFont> m_inMemoryFont; 195 RefPtr<MemoryActivatedFont> m_inMemoryFont;
196 bool m_localFont;
196 #else 197 #else
197 FontRenderStyle m_style; 198 FontRenderStyle m_style;
198 #endif 199 #endif
199 200
200 mutable RefPtr<HarfBuzzFace> m_harfBuzzFace; 201 mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;
201 bool m_isHashTableDeletedValue; 202 bool m_isHashTableDeletedValue;
202 #if OS(WIN) 203 #if OS(WIN)
203 int m_paintTextFlags; 204 int m_paintTextFlags;
204 bool m_useSubpixelPositioning; 205 bool m_useSubpixelPositioning;
205 unsigned m_minSizeForAntiAlias; 206 unsigned m_minSizeForAntiAlias;
206 float m_minSizeForSubpixel; 207 float m_minSizeForSubpixel;
207 #endif 208 #endif
208 }; 209 };
209 210
210 } // namespace blink 211 } // namespace blink
211 212
212 #endif // ifdef FontPlatformData_h 213 #endif // ifdef FontPlatformData_h
OLDNEW
« no previous file with comments | « no previous file | Source/platform/fonts/FontPlatformData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698