Refactor CachingWordShapeIterator::nextWordEndIndex

third_party/WebKit/Source/platform/text/TextRun.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 17 matching lines @@
 #include "platform/fonts/Glyph.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/heap/Heap.h"
 #include "platform/text/TabSize.h"
 #include "platform/text/TextDirection.h"
 #include "platform/text/TextPath.h"
 #include "wtf/Allocator.h"
 #include "wtf/text/StringView.h"
 #include "wtf/text/WTFString.h"
 
+#include <unicode/utf16.h>
+
 class SkTextBlob;
 
 namespace blink {
 
 enum TextJustify {
     TextJustifyAuto = 0x0,
     TextJustifyNone = 0x1,
     TextJustifyInterWord = 0x2,
     TextJustifyDistribute = 0x3
 };
@@ skipping 95 matching lines @@
         return result;
     }
 
     UChar operator[](unsigned i) const { ASSERT_WITH_SECURITY_IMPLICATION(i < m_len); return is8Bit() ? m_data.characters8[i] :m_data.characters16[i]; }
     const LChar* data8(unsigned i) const { ASSERT_WITH_SECURITY_IMPLICATION(i < m_len); ASSERT(is8Bit()); return &m_data.characters8[i]; }
     const UChar* data16(unsigned i) const { ASSERT_WITH_SECURITY_IMPLICATION(i < m_len); ASSERT(!is8Bit()); return &m_data.characters16[i]; }
 
     const LChar* characters8() const { ASSERT(is8Bit()); return m_data.characters8; }
     const UChar* characters16() const { ASSERT(!is8Bit()); return m_data.characters16; }
 
+    UChar32 codepointAtAndNext(unsigned& i) const
+    {
+        if (is8Bit())
+            return (*this)[i++];
+        UChar32 codepoint;
+        SECURITY_DCHECK(i < m_len);
+        U16_NEXT(characters16(), i, m_len, codepoint);
+        return codepoint;
+    }
+
     bool is8Bit() const { return m_is8Bit; }
     unsigned length() const { return m_len; }
     unsigned charactersLength() const { return m_charactersLength; }
 
     bool normalizeSpace() const { return m_normalizeSpace; }
     void setNormalizeSpace(bool normalizeSpace) { m_normalizeSpace = normalizeSpace; }
 
     void setText(const LChar* c, unsigned len) { m_data.characters8 = c; m_len = len; m_is8Bit = true;}
     void setText(const UChar* c, unsigned len) { m_data.characters16 = c; m_len = len; m_is8Bit = false;}
     void setText(const String&);
@@ skipping 72 matching lines @@
 
     const TextRun& run;
     unsigned from;
     unsigned to;
     FloatRect bounds;
     RefPtr<const SkTextBlob>* cachedTextBlob;
 };
 
 } // namespace blink
 #endif