| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2006, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2006, 2008, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Holger Hans Peter Freyther | 3 * Copyright (C) 2008 Holger Hans Peter Freyther |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Library General Public License for more details. | 13 * Library General Public License for more details. |
| 14 * | 14 * |
| 15 * You should have received a copy of the GNU Library General Public License | 15 * You should have received a copy of the GNU Library General Public License |
| 16 * along with this library; see the file COPYING.LIB. If not, write to | 16 * along with this library; see the file COPYING.LIB. If not, write to |
| 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 18 * Boston, MA 02110-1301, USA. | 18 * Boston, MA 02110-1301, USA. |
| 19 * | 19 * |
| 20 */ | 20 */ |
| 21 | 21 |
| 22 #ifndef WidthIterator_h | 22 #ifndef WidthIterator_h |
| 23 #define WidthIterator_h | 23 #define WidthIterator_h |
| 24 | 24 |
| 25 #include "core/platform/graphics/Font.h" | 25 #include "platform/PlatformExport.h" |
| 26 #include "core/platform/graphics/SVGGlyph.h" | 26 #include "platform/fonts/Font.h" |
| 27 #include "platform/fonts/SVGGlyph.h" |
| 27 #include "platform/graphics/TextRun.h" | 28 #include "platform/graphics/TextRun.h" |
| 28 #include "wtf/HashSet.h" | 29 #include "wtf/HashSet.h" |
| 29 #include "wtf/unicode/Unicode.h" | 30 #include "wtf/unicode/Unicode.h" |
| 30 #include "wtf/Vector.h" | 31 #include "wtf/Vector.h" |
| 31 | 32 |
| 32 namespace WebCore { | 33 namespace WebCore { |
| 33 | 34 |
| 34 class Font; | 35 class Font; |
| 35 class GlyphBuffer; | 36 class GlyphBuffer; |
| 36 class SimpleFontData; | 37 class SimpleFontData; |
| 37 class TextRun; | 38 class TextRun; |
| 38 struct GlyphData; | 39 struct GlyphData; |
| 39 | 40 |
| 40 struct WidthIterator { | 41 struct PLATFORM_EXPORT WidthIterator { |
| 41 WTF_MAKE_FAST_ALLOCATED; | 42 WTF_MAKE_FAST_ALLOCATED; |
| 42 public: | 43 public: |
| 43 WidthIterator(const Font*, const TextRun&, HashSet<const SimpleFontData*>* f
allbackFonts = 0, bool accountForGlyphBounds = false, bool forTextEmphasis = fal
se); | 44 WidthIterator(const Font*, const TextRun&, HashSet<const SimpleFontData*>* f
allbackFonts = 0, bool accountForGlyphBounds = false, bool forTextEmphasis = fal
se); |
| 44 | 45 |
| 45 unsigned advance(int to, GlyphBuffer*); | 46 unsigned advance(int to, GlyphBuffer*); |
| 46 bool advanceOneCharacter(float& width, GlyphBuffer&); | 47 bool advanceOneCharacter(float& width, GlyphBuffer&); |
| 47 | 48 |
| 48 float maxGlyphBoundingBoxY() const { ASSERT(m_accountForGlyphBounds); return
m_maxGlyphBoundingBoxY; } | 49 float maxGlyphBoundingBoxY() const { ASSERT(m_accountForGlyphBounds); return
m_maxGlyphBoundingBoxY; } |
| 49 float minGlyphBoundingBoxY() const { ASSERT(m_accountForGlyphBounds); return
m_minGlyphBoundingBoxY; } | 50 float minGlyphBoundingBoxY() const { ASSERT(m_accountForGlyphBounds); return
m_minGlyphBoundingBoxY; } |
| 50 float firstGlyphOverflow() const { ASSERT(m_accountForGlyphBounds); return m
_firstGlyphOverflow; } | 51 float firstGlyphOverflow() const { ASSERT(m_accountForGlyphBounds); return m
_firstGlyphOverflow; } |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 float m_maxGlyphBoundingBoxY; | 95 float m_maxGlyphBoundingBoxY; |
| 95 float m_minGlyphBoundingBoxY; | 96 float m_minGlyphBoundingBoxY; |
| 96 float m_firstGlyphOverflow; | 97 float m_firstGlyphOverflow; |
| 97 float m_lastGlyphOverflow; | 98 float m_lastGlyphOverflow; |
| 98 bool m_forTextEmphasis; | 99 bool m_forTextEmphasis; |
| 99 }; | 100 }; |
| 100 | 101 |
| 101 } | 102 } |
| 102 | 103 |
| 103 #endif | 104 #endif |
| OLD | NEW |