| Index: third_party/WebKit/Source/platform/fonts/UTF16TextIterator.h
|
| diff --git a/third_party/WebKit/Source/platform/fonts/UTF16TextIterator.h b/third_party/WebKit/Source/platform/fonts/UTF16TextIterator.h
|
| index 48c5e66d381ee2dc16faff7c8377ab0397401116..2e73599f4b7602345a6d8bf9d839cdf55dabd765 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/UTF16TextIterator.h
|
| +++ b/third_party/WebKit/Source/platform/fonts/UTF16TextIterator.h
|
| @@ -39,12 +39,8 @@ class PLATFORM_EXPORT UTF16TextIterator {
|
| // 'endOffset'.
|
| UTF16TextIterator(const UChar*, int length);
|
|
|
| - // FIXME: The offset/endOffset fields are only used by the SimpleShaper,
|
| - // remove once HarfBuzz is used for all text.
|
| - UTF16TextIterator(const UChar*, int offset, int endOffset, int length);
|
| -
|
| inline bool consume(UChar32& character) {
|
| - if (m_offset >= m_endOffset)
|
| + if (m_offset >= m_length)
|
| return false;
|
|
|
| character = *m_characters;
|
| @@ -75,7 +71,7 @@ class PLATFORM_EXPORT UTF16TextIterator {
|
| const UChar* m_characters;
|
| const UChar* m_charactersEnd;
|
| int m_offset;
|
| - int m_endOffset;
|
| + int m_length;
|
| unsigned m_currentGlyphLength;
|
| };
|
|
|
|
|