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

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

Issue 205343010: Use FontPlatformDataHarfBuzz.h on Windows (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months 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
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 mac switch to using FontPlatformDataHarfBuzz.h and we merge it with this file.
26 #if OS(WIN) 26 #if !OS(MACOSX)
27 #include "platform/fonts/win/FontPlatformDataWin.h"
28 #elif !OS(MACOSX)
29 #include "platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h" 27 #include "platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h"
30 28
31 #else 29 #else
32 30
33 #ifndef FontPlatformData_h 31 #ifndef FontPlatformData_h
34 #define FontPlatformData_h 32 #define FontPlatformData_h
35 33
36 #include "platform/PlatformExport.h" 34 #include "platform/PlatformExport.h"
37 #include "platform/fonts/FontOrientation.h" 35 #include "platform/fonts/FontOrientation.h"
38 #include "platform/fonts/FontWidthVariant.h" 36 #include "platform/fonts/FontWidthVariant.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 #if OS(MACOSX) 206 #if OS(MACOSX)
209 bool m_isPrinterFont; 207 bool m_isPrinterFont;
210 #endif 208 #endif
211 }; 209 };
212 210
213 } // namespace WebCore 211 } // namespace WebCore
214 212
215 #endif // FontPlatformData_h 213 #endif // FontPlatformData_h
216 214
217 #endif 215 #endif
OLDNEW
« no previous file with comments | « Source/platform/blink_platform.gypi ('k') | Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698