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

Side by Side Diff: Source/core/platform/graphics/FontPlatformData.h

Issue 23654015: Avoid using !OS() constructs. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix merge Created 7 years, 3 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
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/web/EditorClientImpl.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/chromium/FontPlatformDataChromiumWin.h" 27 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h"
28 #elif OS(POSIX) && !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 "core/platform/graphics/FontOrientation.h" 36 #include "core/platform/graphics/FontOrientation.h"
37 #include "core/platform/graphics/FontWidthVariant.h" 37 #include "core/platform/graphics/FontWidthVariant.h"
38 38
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/web/EditorClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698