| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2009, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2009, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2007-2008 Torch Mobile Inc. | 3 * Copyright (C) 2007-2008 Torch Mobile Inc. |
| 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 | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. 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 25 matching lines...) Expand all Loading... |
| 36 #include <wtf/Vector.h> | 36 #include <wtf/Vector.h> |
| 37 | 37 |
| 38 #if OS(DARWIN) | 38 #if OS(DARWIN) |
| 39 #include <ApplicationServices/ApplicationServices.h> | 39 #include <ApplicationServices/ApplicationServices.h> |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace WebCore { |
| 43 | 43 |
| 44 class SimpleFontData; | 44 class SimpleFontData; |
| 45 | 45 |
| 46 #if OS(WINCE) | |
| 47 typedef wchar_t GlyphBufferGlyph; | |
| 48 #else | |
| 49 typedef Glyph GlyphBufferGlyph; | 46 typedef Glyph GlyphBufferGlyph; |
| 50 #endif | |
| 51 | 47 |
| 52 // CG uses CGSize instead of FloatSize so that the result of advances() | 48 // CG uses CGSize instead of FloatSize so that the result of advances() |
| 53 // can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm | 49 // can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm |
| 54 #if OS(DARWIN) | 50 #if OS(DARWIN) |
| 55 struct GlyphBufferAdvance : CGSize { | 51 struct GlyphBufferAdvance : CGSize { |
| 56 public: | 52 public: |
| 57 GlyphBufferAdvance(CGSize size) : CGSize(size) | 53 GlyphBufferAdvance(CGSize size) : CGSize(size) |
| 58 { | 54 { |
| 59 } | 55 } |
| 60 | 56 |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 m_advances[index2] = s; | 149 m_advances[index2] = s; |
| 154 } | 150 } |
| 155 | 151 |
| 156 Vector<const SimpleFontData*, 2048> m_fontData; | 152 Vector<const SimpleFontData*, 2048> m_fontData; |
| 157 Vector<GlyphBufferGlyph, 2048> m_glyphs; | 153 Vector<GlyphBufferGlyph, 2048> m_glyphs; |
| 158 Vector<GlyphBufferAdvance, 2048> m_advances; | 154 Vector<GlyphBufferAdvance, 2048> m_advances; |
| 159 }; | 155 }; |
| 160 | 156 |
| 161 } | 157 } |
| 162 #endif | 158 #endif |
| OLD | NEW |