| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Computer, Inc. | 2 * Copyright (C) 2007 Apple Computer, Inc. |
| 3 * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved. | 3 * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 */ | 30 */ |
| 31 | 31 |
| 32 #ifndef FontCustomPlatformData_h | 32 #ifndef FontCustomPlatformData_h |
| 33 #define FontCustomPlatformData_h | 33 #define FontCustomPlatformData_h |
| 34 | 34 |
| 35 #include "core/platform/graphics/FontOrientation.h" | 35 #include "platform/fonts/FontOrientation.h" |
| 36 #include "core/platform/graphics/FontWidthVariant.h" | 36 #include "platform/fonts/FontWidthVariant.h" |
| 37 #include "wtf/Forward.h" | 37 #include "wtf/Forward.h" |
| 38 #include "wtf/Noncopyable.h" | 38 #include "wtf/Noncopyable.h" |
| 39 #include "wtf/text/WTFString.h" | 39 #include "wtf/text/WTFString.h" |
| 40 | 40 |
| 41 #if OS(WIN) && ENABLE(GDI_FONTS_ON_WINDOWS) | 41 #if OS(WIN) && ENABLE(GDI_FONTS_ON_WINDOWS) |
| 42 #include <windows.h> | 42 #include <windows.h> |
| 43 #endif | 43 #endif |
| 44 | 44 |
| 45 #if OS(MACOSX) | 45 #if OS(MACOSX) |
| 46 #include "wtf/RetainPtr.h" | 46 #include "wtf/RetainPtr.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 RefPtr<SkTypeface> m_typeface; | 79 RefPtr<SkTypeface> m_typeface; |
| 80 #elif OS(POSIX) || (OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS)) | 80 #elif OS(POSIX) || (OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS)) |
| 81 explicit FontCustomPlatformData(PassRefPtr<SkTypeface>); | 81 explicit FontCustomPlatformData(PassRefPtr<SkTypeface>); |
| 82 RefPtr<SkTypeface> m_typeface; | 82 RefPtr<SkTypeface> m_typeface; |
| 83 #endif | 83 #endif |
| 84 }; | 84 }; |
| 85 | 85 |
| 86 } // namespace WebCore | 86 } // namespace WebCore |
| 87 | 87 |
| 88 #endif // FontCustomPlatformData_h | 88 #endif // FontCustomPlatformData_h |
| OLD | NEW |