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

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

Issue 99103006: Moving GraphicsContext and dependencies from core to platform. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final patch - fixes Android Created 7 years 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 | « Source/platform/fonts/FontFastPath.cpp ('k') | 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, 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/win/FontPlatformDataWin.h" 27 #include "platform/fonts/win/FontPlatformDataWin.h"
28 #elif !OS(MACOSX) 28 #elif !OS(MACOSX)
29 #include "core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h" 29 #include "platform/fonts/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/PlatformExport.h"
36 #include "platform/fonts/FontOrientation.h" 37 #include "platform/fonts/FontOrientation.h"
37 #include "platform/fonts/FontWidthVariant.h" 38 #include "platform/fonts/FontWidthVariant.h"
38 39
39 #if OS(MACOSX) 40 #if OS(MACOSX)
40 OBJC_CLASS NSFont; 41 OBJC_CLASS NSFont;
41 42
42 typedef struct CGFont* CGFontRef; 43 typedef struct CGFont* CGFontRef;
43 typedef const struct __CTFont* CTFontRef; 44 typedef const struct __CTFont* CTFontRef;
44 45
45 #include <CoreFoundation/CFBase.h> 46 #include <CoreFoundation/CFBase.h>
46 #include <objc/objc-auto.h> 47 #include <objc/objc-auto.h>
47 #endif 48 #endif
48 49
49 #include "wtf/Forward.h" 50 #include "wtf/Forward.h"
50 #include "wtf/HashTableDeletedValueType.h" 51 #include "wtf/HashTableDeletedValueType.h"
51 #include "wtf/PassRefPtr.h" 52 #include "wtf/PassRefPtr.h"
52 #include "wtf/RefCounted.h" 53 #include "wtf/RefCounted.h"
53 #include "wtf/RetainPtr.h" 54 #include "wtf/RetainPtr.h"
54 #include "wtf/text/StringImpl.h" 55 #include "wtf/text/StringImpl.h"
55 56
56 #if OS(MACOSX) 57 #if OS(MACOSX)
57 #include "core/platform/graphics/mac/MemoryActivatedFont.h" 58 #include "platform/fonts/mac/MemoryActivatedFont.h"
58 #endif 59 #endif
59 60
60 #if OS(MACOSX) 61 #if OS(MACOSX)
61 typedef struct CGFont* CGFontRef; 62 typedef struct CGFont* CGFontRef;
62 typedef const struct __CTFont* CTFontRef; 63 typedef const struct __CTFont* CTFontRef;
63 typedef UInt32 FMFont; 64 typedef UInt32 FMFont;
64 typedef FMFont ATSUFontID; 65 typedef FMFont ATSUFontID;
65 typedef UInt32 ATSFontRef; 66 typedef UInt32 ATSFontRef;
66 #endif 67 #endif
67 68
68 namespace WebCore { 69 namespace WebCore {
69 70
70 class FontDescription; 71 class FontDescription;
71 class SharedBuffer; 72 class SharedBuffer;
72 73
73 #if OS(MACOSX) 74 #if OS(MACOSX)
74 class HarfBuzzFace; 75 class HarfBuzzFace;
75 #endif 76 #endif
76 77
77 #if OS(MACOSX) 78 #if OS(MACOSX)
78 inline CTFontRef toCTFontRef(NSFont *nsFont) { return reinterpret_cast<CTFontRef >(nsFont); } 79 inline CTFontRef toCTFontRef(NSFont *nsFont) { return reinterpret_cast<CTFontRef >(nsFont); }
79 #endif 80 #endif
80 81
81 class FontPlatformData { 82 class PLATFORM_EXPORT FontPlatformData {
82 public: 83 public:
83 FontPlatformData(WTF::HashTableDeletedValueType); 84 FontPlatformData(WTF::HashTableDeletedValueType);
84 FontPlatformData(); 85 FontPlatformData();
85 FontPlatformData(const FontPlatformData&); 86 FontPlatformData(const FontPlatformData&);
86 FontPlatformData(const FontDescription&, const AtomicString& family); 87 FontPlatformData(const FontDescription&, const AtomicString& family);
87 FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, Font Orientation = Horizontal, FontWidthVariant = RegularWidth); 88 FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, Font Orientation = Horizontal, FontWidthVariant = RegularWidth);
88 89
89 #if OS(MACOSX) 90 #if OS(MACOSX)
90 FontPlatformData(NSFont*, float size, bool isPrinterFont = false, bool synth eticBold = false, bool syntheticOblique = false, 91 FontPlatformData(NSFont*, float size, bool isPrinterFont = false, bool synth eticBold = false, bool syntheticOblique = false,
91 FontOrientation = Horizontal, FontWidthVariant = RegularWid th); 92 FontOrientation = Horizontal, FontWidthVariant = RegularWid th);
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 #if OS(MACOSX) 205 #if OS(MACOSX)
205 bool m_isPrinterFont; 206 bool m_isPrinterFont;
206 #endif 207 #endif
207 }; 208 };
208 209
209 } // namespace WebCore 210 } // namespace WebCore
210 211
211 #endif // FontPlatformData_h 212 #endif // FontPlatformData_h
212 213
213 #endif 214 #endif
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontFastPath.cpp ('k') | Source/platform/fonts/FontPlatformData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698