| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 2 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 } | 61 } |
| 62 | 62 |
| 63 int offset() const { return m_offset; } | 63 int offset() const { return m_offset; } |
| 64 const UChar* characters() const { return m_characters; } | 64 const UChar* characters() const { return m_characters; } |
| 65 const UChar* glyphEnd() const { return m_characters + m_currentGlyphLength;
} | 65 const UChar* glyphEnd() const { return m_characters + m_currentGlyphLength;
} |
| 66 // FIXME: Only used by SimpleShaper, should be removed once the SimpleShaper | 66 // FIXME: Only used by SimpleShaper, should be removed once the SimpleShaper |
| 67 // is removed. | 67 // is removed. |
| 68 unsigned glyphLength() const { return m_currentGlyphLength; } | 68 unsigned glyphLength() const { return m_currentGlyphLength; } |
| 69 | 69 |
| 70 private: | 70 private: |
| 71 bool isValidSurrogatePair(UChar32&); |
| 71 bool consumeSurrogatePair(UChar32&); | 72 bool consumeSurrogatePair(UChar32&); |
| 72 void consumeMultipleUChar(); | 73 void consumeMultipleUChar(); |
| 73 | 74 |
| 74 const UChar* m_characters; | 75 const UChar* m_characters; |
| 75 const UChar* m_charactersEnd; | 76 const UChar* m_charactersEnd; |
| 76 int m_offset; | 77 int m_offset; |
| 77 int m_endOffset; | 78 int m_endOffset; |
| 78 unsigned m_currentGlyphLength; | 79 unsigned m_currentGlyphLength; |
| 79 }; | 80 }; |
| 80 | 81 |
| 81 } | 82 } |
| 82 | 83 |
| 83 #endif | 84 #endif |
| OLD | NEW |