WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/rendering/RenderText.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * 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
@@ skipping 1129 matching lines @@
 {
     int l = 0;
     for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox())
         l += box->len();
     return l;
 }
 
 int RenderText::previousOffset(int current) const
 {
     StringImpl* si = m_text.get();
-    TextBreakIterator* iterator = characterBreakIterator(si->characters(), si->length());
+    TextBreakIterator* iterator = cursorMovementIterator(si->characters(), si->length());
     if (!iterator)
         return current - 1;
 
     long result = textBreakPreceding(iterator, current);
     if (result == TextBreakDone)
         result = current - 1;
 
 #ifdef BUILDING_ON_TIGER
     // ICU 3.2 allows character breaks before a half-width Katakana voiced mark.
     if (static_cast<unsigned>(result) < si->length()) {
@@ skipping 102 matching lines @@
     return current;
 #else
     // Platforms other than Mac delete by one code point.
     return current - 1;
 #endif
 }
 
 int RenderText::nextOffset(int current) const
 {
     StringImpl* si = m_text.get();
-    TextBreakIterator* iterator = characterBreakIterator(si->characters(), si->length());
+    TextBreakIterator* iterator = cursorMovementIterator(si->characters(), si->length());
     if (!iterator)
         return current + 1;
 
     long result = textBreakFollowing(iterator, current);
     if (result == TextBreakDone)
         result = current + 1;
 
 #ifdef BUILDING_ON_TIGER
     // ICU 3.2 allows character breaks before a half-width Katakana voiced mark.
     if (static_cast<unsigned>(result) < si->length()) {
@@ skipping 17 matching lines @@
         ASSERT(child->prevTextBox() == prev);
         prev = child;
     }
     ASSERT(prev == m_lastTextBox);
 #endif
 }
 
 #endif
 
 } // namespace WebCore