| OLD | NEW |
| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 FontOrientation orientation() const { return m_orientation; } | 96 FontOrientation orientation() const { return m_orientation; } |
| 97 void setOrientation(FontOrientation orientation) { m_orientation = orientati
on; } | 97 void setOrientation(FontOrientation orientation) { m_orientation = orientati
on; } |
| 98 | 98 |
| 99 unsigned hash() const | 99 unsigned hash() const |
| 100 { | 100 { |
| 101 return m_font ? m_font->hash() : NULL; | 101 return m_font ? m_font->hash() : NULL; |
| 102 } | 102 } |
| 103 | 103 |
| 104 bool operator==(const FontPlatformData& other) const | 104 bool operator==(const FontPlatformData& other) const |
| 105 { | 105 { |
| 106 return m_font == other.m_font && m_size == other.m_size && m_orientation
== other.m_orientation; | 106 return m_font == other.m_font && m_size == other.m_size && m_fakeBold ==
other.m_fakeBold && m_fakeItalic == other.m_fakeItalic && m_orientation == othe
r.m_orientation; |
| 107 } | 107 } |
| 108 | 108 |
| 109 #if ENABLE(OPENTYPE_VERTICAL) | 109 #if ENABLE(OPENTYPE_VERTICAL) |
| 110 PassRefPtr<OpenTypeVerticalData> verticalData() const; | 110 PassRefPtr<OpenTypeVerticalData> verticalData() const; |
| 111 PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const; | 111 PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const; |
| 112 #endif | 112 #endif |
| 113 | 113 |
| 114 #ifndef NDEBUG | 114 #ifndef NDEBUG |
| 115 String description() const; | 115 String description() const; |
| 116 #endif | 116 #endif |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 RefCountedHFONT(HFONT hfont) : m_hfont(hfont) | 150 RefCountedHFONT(HFONT hfont) : m_hfont(hfont) |
| 151 { | 151 { |
| 152 } | 152 } |
| 153 | 153 |
| 154 HFONT m_hfont; | 154 HFONT m_hfont; |
| 155 }; | 155 }; |
| 156 | 156 |
| 157 RefPtr<RefCountedHFONT> m_font; | 157 RefPtr<RefCountedHFONT> m_font; |
| 158 float m_size; // Point size of the font in pixels. | 158 float m_size; // Point size of the font in pixels. |
| 159 FontOrientation m_orientation; | 159 FontOrientation m_orientation; |
| 160 bool m_fakeBold; |
| 161 bool m_fakeItalic; |
| 160 | 162 |
| 161 RefPtr<SkTypeface> m_typeface; // cached from m_font | 163 RefPtr<SkTypeface> m_typeface; // cached from m_font |
| 162 int m_paintTextFlags; // cached from m_font | 164 int m_paintTextFlags; // cached from m_font |
| 163 | 165 |
| 164 mutable SCRIPT_CACHE m_scriptCache; | 166 mutable SCRIPT_CACHE m_scriptCache; |
| 165 mutable OwnPtr<SCRIPT_FONTPROPERTIES> m_scriptFontProperties; | 167 mutable OwnPtr<SCRIPT_FONTPROPERTIES> m_scriptFontProperties; |
| 166 | 168 |
| 167 bool m_isHashTableDeletedValue; | 169 bool m_isHashTableDeletedValue; |
| 168 }; | 170 }; |
| 169 | 171 |
| 170 } // WebCore | 172 } // WebCore |
| 171 | 173 |
| 172 #endif // FontPlatformDataChromiumWin_h | 174 #endif // FontPlatformDataChromiumWin_h |
| OLD | NEW |