Refactor CachingWordShapeIterator::nextWordEndIndex

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

Index: third_party/WebKit/Source/platform/text/TextRun.h
diff --git a/third_party/WebKit/Source/platform/text/TextRun.h b/third_party/WebKit/Source/platform/text/TextRun.h
index bcf4105c2dce30259ff664fe8ec347c2d56817a8..9da5d7474495bebb5b4dc5f6d4ad438c09f857c5 100644
--- a/third_party/WebKit/Source/platform/text/TextRun.h
+++ b/third_party/WebKit/Source/platform/text/TextRun.h
@@ -35,6 +35,8 @@
 #include "wtf/text/StringView.h"
 #include "wtf/text/WTFString.h"
 
+#include <unicode/utf16.h>
+
 class SkTextBlob;
 
 namespace blink {
@@ -150,6 +152,16 @@ public:
     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; }