| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. |
| 6 * Copyright (C) 2008 Holger Hans Peter Freyther | 6 * Copyright (C) 2008 Holger Hans Peter Freyther |
| 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 #ifndef Font_h | 25 #ifndef Font_h |
| 26 #define Font_h | 26 #define Font_h |
| 27 | 27 |
| 28 #include "core/platform/graphics/FontDescription.h" | |
| 29 #include "core/platform/graphics/FontFallbackList.h" | 28 #include "core/platform/graphics/FontFallbackList.h" |
| 30 #include "core/platform/graphics/SimpleFontData.h" | 29 #include "core/platform/graphics/SimpleFontData.h" |
| 31 #include "core/platform/graphics/TypesettingFeatures.h" | 30 #include "platform/fonts/FontDescription.h" |
| 31 #include "platform/fonts/TypesettingFeatures.h" |
| 32 #include "platform/text/TextDirection.h" | 32 #include "platform/text/TextDirection.h" |
| 33 #include "wtf/HashMap.h" | 33 #include "wtf/HashMap.h" |
| 34 #include "wtf/HashSet.h" | 34 #include "wtf/HashSet.h" |
| 35 #include "wtf/MathExtras.h" | 35 #include "wtf/MathExtras.h" |
| 36 #include "wtf/unicode/CharacterNames.h" | 36 #include "wtf/unicode/CharacterNames.h" |
| 37 | 37 |
| 38 // "X11/X.h" defines Complex to 0 and conflicts | 38 // "X11/X.h" defines Complex to 0 and conflicts |
| 39 // with Complex value in CodePath enum. | 39 // with Complex value in CodePath enum. |
| 40 #ifdef Complex | 40 #ifdef Complex |
| 41 #undef Complex | 41 #undef Complex |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 | 333 |
| 334 namespace WTF { | 334 namespace WTF { |
| 335 | 335 |
| 336 template <> struct OwnedPtrDeleter<WebCore::TextLayout> { | 336 template <> struct OwnedPtrDeleter<WebCore::TextLayout> { |
| 337 static void deletePtr(WebCore::TextLayout*); | 337 static void deletePtr(WebCore::TextLayout*); |
| 338 }; | 338 }; |
| 339 | 339 |
| 340 } | 340 } |
| 341 | 341 |
| 342 #endif | 342 #endif |
| OLD | NEW |