| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. | 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. |
| 3 * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com | 3 * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com |
| 4 * Copyright (C) 2007 Holger Hans Peter Freyther | 4 * Copyright (C) 2007 Holger Hans Peter Freyther |
| 5 * Copyright (C) 2007 Pioneer Research Center USA, Inc. | 5 * Copyright (C) 2007 Pioneer Research Center USA, Inc. |
| 6 * Copyright (C) 2010, 2011 Brent Fulgham <bfulgham@webkit.org> | 6 * Copyright (C) 2010, 2011 Brent Fulgham <bfulgham@webkit.org> |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 #endif | 58 #endif |
| 59 | 59 |
| 60 #if OS(MACOSX) | 60 #if OS(MACOSX) |
| 61 typedef struct CGFont* CGFontRef; | 61 typedef struct CGFont* CGFontRef; |
| 62 typedef const struct __CTFont* CTFontRef; | 62 typedef const struct __CTFont* CTFontRef; |
| 63 typedef UInt32 FMFont; | 63 typedef UInt32 FMFont; |
| 64 typedef FMFont ATSUFontID; | 64 typedef FMFont ATSUFontID; |
| 65 typedef UInt32 ATSFontRef; | 65 typedef UInt32 ATSFontRef; |
| 66 #endif | 66 #endif |
| 67 | 67 |
| 68 namespace WebCore { | 68 namespace blink { |
| 69 | 69 |
| 70 class FontDescription; | 70 class FontDescription; |
| 71 class SharedBuffer; | 71 class SharedBuffer; |
| 72 | 72 |
| 73 #if OS(MACOSX) | 73 #if OS(MACOSX) |
| 74 class HarfBuzzFace; | 74 class HarfBuzzFace; |
| 75 #endif | 75 #endif |
| 76 | 76 |
| 77 #if OS(MACOSX) | 77 #if OS(MACOSX) |
| 78 inline CTFontRef toCTFontRef(NSFont *nsFont) { return reinterpret_cast<CTFontRef
>(nsFont); } | 78 inline CTFontRef toCTFontRef(NSFont *nsFont) { return reinterpret_cast<CTFontRef
>(nsFont); } |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 | 193 |
| 194 RefPtr<MemoryActivatedFont> m_inMemoryFont; | 194 RefPtr<MemoryActivatedFont> m_inMemoryFont; |
| 195 RefPtr<HarfBuzzFace> m_harfBuzzFace; | 195 RefPtr<HarfBuzzFace> m_harfBuzzFace; |
| 196 mutable RefPtr<SkTypeface> m_typeface; | 196 mutable RefPtr<SkTypeface> m_typeface; |
| 197 #endif | 197 #endif |
| 198 | 198 |
| 199 bool m_isColorBitmapFont; | 199 bool m_isColorBitmapFont; |
| 200 bool m_isCompositeFontReference; | 200 bool m_isCompositeFontReference; |
| 201 }; | 201 }; |
| 202 | 202 |
| 203 } // namespace WebCore | 203 } // namespace blink |
| 204 | 204 |
| 205 #endif // FontPlatformData_h | 205 #endif // FontPlatformData_h |
| 206 | 206 |
| 207 #endif | 207 #endif |
| OLD | NEW |