| 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 13 matching lines...) Expand all Loading... |
| 24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #ifndef GlyphBuffer_h | 30 #ifndef GlyphBuffer_h |
| 31 #define GlyphBuffer_h | 31 #define GlyphBuffer_h |
| 32 | 32 |
| 33 #include "platform/fonts/Glyph.h" | 33 #include "platform/fonts/Glyph.h" |
| 34 #include "platform/fonts/GlyphBuffer.h" | |
| 35 #include "platform/geometry/FloatSize.h" | 34 #include "platform/geometry/FloatSize.h" |
| 36 #include "wtf/Vector.h" | 35 #include "wtf/Vector.h" |
| 37 | 36 |
| 38 #if OS(MACOSX) | 37 #if OS(MACOSX) |
| 39 #include <ApplicationServices/ApplicationServices.h> | 38 #include <ApplicationServices/ApplicationServices.h> |
| 40 #endif | 39 #endif |
| 41 | 40 |
| 42 namespace WebCore { | 41 namespace WebCore { |
| 43 | 42 |
| 44 class SimpleFontData; | 43 class SimpleFontData; |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 m_advances[index2] = s; | 143 m_advances[index2] = s; |
| 145 } | 144 } |
| 146 | 145 |
| 147 Vector<const SimpleFontData*, 2048> m_fontData; | 146 Vector<const SimpleFontData*, 2048> m_fontData; |
| 148 Vector<GlyphBufferGlyph, 2048> m_glyphs; | 147 Vector<GlyphBufferGlyph, 2048> m_glyphs; |
| 149 Vector<GlyphBufferAdvance, 2048> m_advances; | 148 Vector<GlyphBufferAdvance, 2048> m_advances; |
| 150 }; | 149 }; |
| 151 | 150 |
| 152 } | 151 } |
| 153 #endif | 152 #endif |
| OLD | NEW |