| 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 |
| 11 * version 2 of the License, or (at your option) any later version. | 11 * version 2 of the License, or (at your option) any later version. |
| 12 * | 12 * |
| 13 * This library is distributed in the hope that it will be useful, | 13 * This library is distributed in the hope that it will be useful, |
| 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 16 * Library General Public License for more details. | 16 * Library General Public License for more details. |
| 17 * | 17 * |
| 18 * You should have received a copy of the GNU Library General Public License | 18 * You should have received a copy of the GNU Library General Public License |
| 19 * along with this library; see the file COPYING.LIB. If not, write to | 19 * along with this library; see the file COPYING.LIB. If not, write to |
| 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 21 * Boston, MA 02110-1301, USA. | 21 * Boston, MA 02110-1301, USA. |
| 22 * | 22 * |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 // FIXME: This is temporary until all ports switch to using this file. | 25 // FIXME: This is temporary until all ports switch to using this file. |
| 26 #if OS(WIN) | 26 #if OS(WIN) |
| 27 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h" | 27 #include "core/platform/graphics/win/FontPlatformDataWin.h" |
| 28 #elif !OS(MACOSX) | 28 #elif !OS(MACOSX) |
| 29 #include "core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h" | 29 #include "core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h" |
| 30 | 30 |
| 31 #else | 31 #else |
| 32 | 32 |
| 33 #ifndef FontPlatformData_h | 33 #ifndef FontPlatformData_h |
| 34 #define FontPlatformData_h | 34 #define FontPlatformData_h |
| 35 | 35 |
| 36 #include "platform/fonts/FontOrientation.h" | 36 #include "platform/fonts/FontOrientation.h" |
| 37 #include "platform/fonts/FontWidthVariant.h" | 37 #include "platform/fonts/FontWidthVariant.h" |
| 38 | 38 |
| 39 #if OS(MACOSX) | 39 #if OS(MACOSX) |
| 40 OBJC_CLASS NSFont; | 40 OBJC_CLASS NSFont; |
| 41 | 41 |
| 42 typedef struct CGFont* CGFontRef; | 42 typedef struct CGFont* CGFontRef; |
| 43 typedef const struct __CTFont* CTFontRef; | 43 typedef const struct __CTFont* CTFontRef; |
| 44 | 44 |
| 45 #include <CoreFoundation/CFBase.h> | 45 #include <CoreFoundation/CFBase.h> |
| 46 #include <objc/objc-auto.h> | 46 #include <objc/objc-auto.h> |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 #include "wtf/Forward.h" | 49 #include "wtf/Forward.h" |
| 50 #include "wtf/HashTableDeletedValueType.h" | 50 #include "wtf/HashTableDeletedValueType.h" |
| 51 #include "wtf/PassRefPtr.h" | 51 #include "wtf/PassRefPtr.h" |
| 52 #include "wtf/RefCounted.h" | 52 #include "wtf/RefCounted.h" |
| 53 #include "wtf/RetainPtr.h" | 53 #include "wtf/RetainPtr.h" |
| 54 #include "wtf/text/StringImpl.h" | 54 #include "wtf/text/StringImpl.h" |
| 55 | 55 |
| 56 #if OS(MACOSX) | 56 #if OS(MACOSX) |
| 57 #include "core/platform/graphics/chromium/CrossProcessFontLoading.h" | 57 #include "core/platform/graphics/mac/MemoryActivatedFont.h" |
| 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 |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 #if OS(MACOSX) | 204 #if OS(MACOSX) |
| 205 bool m_isPrinterFont; | 205 bool m_isPrinterFont; |
| 206 #endif | 206 #endif |
| 207 }; | 207 }; |
| 208 | 208 |
| 209 } // namespace WebCore | 209 } // namespace WebCore |
| 210 | 210 |
| 211 #endif // FontPlatformData_h | 211 #endif // FontPlatformData_h |
| 212 | 212 |
| 213 #endif | 213 #endif |
| OLD | NEW |