<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209907] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209907">209907</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-12-15 21:19:32 -0800 (Thu, 15 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop reinterpret_casting UBreakIterators to the undefined type TextBreakIterator
https://bugs.webkit.org/show_bug.cgi?id=165931
Source/WebCore:
Reviewed by Alex Christensen.
No new tests because there is no behavior change.
* dom/CharacterData.cpp:
(WebCore::CharacterData::parserAppendData):
* editing/TextCheckingHelper.cpp:
(WebCore::findMisspellings):
* editing/VisibleUnits.cpp:
(WebCore::wordBreakIteratorForMinOffsetBoundary):
(WebCore::wordBreakIteratorForMaxOffsetBoundary):
(WebCore::isLogicalStartOfWord):
(WebCore::islogicalEndOfWord):
(WebCore::visualWordPosition):
(WebCore::startSentenceBoundary):
(WebCore::endSentenceBoundary):
(WebCore::previousSentencePositionBoundary):
(WebCore::nextSentencePositionBoundary):
* html/HTMLInputElement.cpp:
* html/HTMLTextAreaElement.cpp:
* html/InputType.cpp:
* html/TextFieldInputType.cpp:
* html/TextInputType.cpp:
* platform/graphics/StringTruncator.cpp:
(WebCore::textBreakAtOrPreceding):
(WebCore::boundedTextBreakFollowing):
(WebCore::rightClipToWordBuffer):
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::ComplexTextController::offsetForPosition):
* platform/text/TextBoundaries.cpp:
(WebCore::findNextWordFromIndex):
(WebCore::findWordBoundary):
(WebCore::findEndWordBoundary):
* platform/text/mac/TextBoundaries.mm:
(WebCore::findNextWordFromIndex):
* rendering/BreakLines.h:
(WebCore::nextBreakablePositionNonLoosely):
(WebCore::nextBreakablePositionLoosely):
* rendering/RenderBlock.cpp:
* rendering/RenderText.cpp:
(WebCore::makeCapitalized):
(WebCore::RenderText::previousOffset):
(WebCore::RenderText::previousOffsetForBackwardDeletion):
(WebCore::RenderText::nextOffset):
* rendering/SimpleLineLayoutTextFragmentIterator.h:
* rendering/line/LineBreaker.h:
Source/WebKit/ios:
Reviewed by Alex Christensen.
* Misc/WebUIKitSupport.mm:
Source/WTF:
We have a class declaration for TextBreakIterator but no definition for it. When we
create an ICU UBreakIterator, we immediately reinterpret_cast it to this undefined
type, and pass it around our code inside WebCore. Then, whenever we want to actually
use this iterator, we reinterpret_cast it back to UBreakIterator. This is likely due
to some ports historically implementing breaking interators on top of other libraries
other than ICU; however, now, all ports use ICU. Because this internal type is not
helpful and just adds confusion, we should just call our breaking iterators what
they are: UBreakIterators.
This patch is a mechanical replacement of TextBreakIterator to UBreakIterator and
removes the functions we were calling which pass through directly to ubrk_*().
Reviewed by Alex Christensen.
* wtf/text/LineBreakIteratorPoolICU.h:
(WTF::LineBreakIteratorPool::take):
(WTF::LineBreakIteratorPool::put):
* wtf/text/StringView.cpp:
(WTF::StringView::GraphemeClusters::Iterator::Impl::computeIndexEnd):
* wtf/text/TextBreakIterator.cpp:
(WTF::initializeIterator):
(WTF::initializeIteratorWithRules):
(WTF::setTextForIterator):
(WTF::setContextAwareTextForIterator):
(WTF::wordBreakIterator):
(WTF::sentenceBreakIterator):
(WTF::cursorMovementIterator):
(WTF::acquireLineBreakIterator):
(WTF::releaseLineBreakIterator):
(WTF::openLineBreakIterator):
(WTF::closeLineBreakIterator):
(WTF::getNonSharedCharacterBreakIterator):
(WTF::cacheNonSharedCharacterBreakIterator):
(WTF::isWordTextBreak):
(WTF::numGraphemeClusters):
(WTF::numCharactersInGraphemeClusters):
(WTF::textBreakFirst): Deleted.
(WTF::textBreakLast): Deleted.
(WTF::textBreakNext): Deleted.
(WTF::textBreakPrevious): Deleted.
(WTF::textBreakPreceding): Deleted.
(WTF::textBreakFollowing): Deleted.
(WTF::textBreakCurrent): Deleted.
(WTF::isTextBreak): Deleted.
* wtf/text/TextBreakIterator.h:
(WTF::LazyLineBreakIterator::lastCharacter):
(WTF::LazyLineBreakIterator::secondToLastCharacter):
(WTF::LazyLineBreakIterator::setPriorContext):
(WTF::LazyLineBreakIterator::updatePriorContext):
(WTF::LazyLineBreakIterator::resetPriorContext):
(WTF::LazyLineBreakIterator::priorContextLength):
(WTF::LazyLineBreakIterator::get):
(WTF::NonSharedCharacterBreakIterator::operator UBreakIterator*):
(WTF::NonSharedCharacterBreakIterator::operator TextBreakIterator*): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtftextLineBreakIteratorPoolICUh">trunk/Source/WTF/wtf/text/LineBreakIteratorPoolICU.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewcpp">trunk/Source/WTF/wtf/text/StringView.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextTextBreakIteratorcpp">trunk/Source/WTF/wtf/text/TextBreakIterator.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextTextBreakIteratorh">trunk/Source/WTF/wtf/text/TextBreakIterator.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDatacpp">trunk/Source/WebCore/dom/CharacterData.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextCheckingHelpercpp">trunk/Source/WebCore/editing/TextCheckingHelper.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitscpp">trunk/Source/WebCore/editing/VisibleUnits.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextAreaElementcpp">trunk/Source/WebCore/html/HTMLTextAreaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlInputTypecpp">trunk/Source/WebCore/html/InputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlTextFieldInputTypecpp">trunk/Source/WebCore/html/TextFieldInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlTextInputTypecpp">trunk/Source/WebCore/html/TextInputType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsStringTruncatorcpp">trunk/Source/WebCore/platform/graphics/StringTruncator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacComplexTextControllercpp">trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextBoundariescpp">trunk/Source/WebCore/platform/text/TextBoundaries.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextenchantTextCheckerEnchantcpp">trunk/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextmacTextBoundariesmm">trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingBreakLinesh">trunk/Source/WebCore/rendering/BreakLines.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorh">trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineBreakerh">trunk/Source/WebCore/rendering/line/LineBreaker.h</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebUIKitSupportmm">trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflTextCheckerEflcpp">trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkTextCheckerGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WTF/ChangeLog 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -1,5 +1,65 @@
</span><span class="cx"> 2016-12-15 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ Stop reinterpret_casting UBreakIterators to the undefined type TextBreakIterator
+ https://bugs.webkit.org/show_bug.cgi?id=165931
+
+ We have a class declaration for TextBreakIterator but no definition for it. When we
+ create an ICU UBreakIterator, we immediately reinterpret_cast it to this undefined
+ type, and pass it around our code inside WebCore. Then, whenever we want to actually
+ use this iterator, we reinterpret_cast it back to UBreakIterator. This is likely due
+ to some ports historically implementing breaking interators on top of other libraries
+ other than ICU; however, now, all ports use ICU. Because this internal type is not
+ helpful and just adds confusion, we should just call our breaking iterators what
+ they are: UBreakIterators.
+
+ This patch is a mechanical replacement of TextBreakIterator to UBreakIterator and
+ removes the functions we were calling which pass through directly to ubrk_*().
+
+ Reviewed by Alex Christensen.
+
+ * wtf/text/LineBreakIteratorPoolICU.h:
+ (WTF::LineBreakIteratorPool::take):
+ (WTF::LineBreakIteratorPool::put):
+ * wtf/text/StringView.cpp:
+ (WTF::StringView::GraphemeClusters::Iterator::Impl::computeIndexEnd):
+ * wtf/text/TextBreakIterator.cpp:
+ (WTF::initializeIterator):
+ (WTF::initializeIteratorWithRules):
+ (WTF::setTextForIterator):
+ (WTF::setContextAwareTextForIterator):
+ (WTF::wordBreakIterator):
+ (WTF::sentenceBreakIterator):
+ (WTF::cursorMovementIterator):
+ (WTF::acquireLineBreakIterator):
+ (WTF::releaseLineBreakIterator):
+ (WTF::openLineBreakIterator):
+ (WTF::closeLineBreakIterator):
+ (WTF::getNonSharedCharacterBreakIterator):
+ (WTF::cacheNonSharedCharacterBreakIterator):
+ (WTF::isWordTextBreak):
+ (WTF::numGraphemeClusters):
+ (WTF::numCharactersInGraphemeClusters):
+ (WTF::textBreakFirst): Deleted.
+ (WTF::textBreakLast): Deleted.
+ (WTF::textBreakNext): Deleted.
+ (WTF::textBreakPrevious): Deleted.
+ (WTF::textBreakPreceding): Deleted.
+ (WTF::textBreakFollowing): Deleted.
+ (WTF::textBreakCurrent): Deleted.
+ (WTF::isTextBreak): Deleted.
+ * wtf/text/TextBreakIterator.h:
+ (WTF::LazyLineBreakIterator::lastCharacter):
+ (WTF::LazyLineBreakIterator::secondToLastCharacter):
+ (WTF::LazyLineBreakIterator::setPriorContext):
+ (WTF::LazyLineBreakIterator::updatePriorContext):
+ (WTF::LazyLineBreakIterator::resetPriorContext):
+ (WTF::LazyLineBreakIterator::priorContextLength):
+ (WTF::LazyLineBreakIterator::get):
+ (WTF::NonSharedCharacterBreakIterator::operator UBreakIterator*):
+ (WTF::NonSharedCharacterBreakIterator::operator TextBreakIterator*): Deleted.
+
+2016-12-15 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> Sort Xcode project files
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165937
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WTF/wtf/Platform.h 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -1208,7 +1208,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</span><del>-#define HAVE_TOUCH_BAR 1
</del><ins>+#define HAVE_TOUCH_BAR 0
</ins><span class="cx"> #define HAVE_ADVANCED_SPELL_CHECKING 1
</span><span class="cx">
</span><span class="cx"> #if defined(__LP64__)
</span></span></pre></div>
<a id="trunkSourceWTFwtftextLineBreakIteratorPoolICUh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/LineBreakIteratorPoolICU.h (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/LineBreakIteratorPoolICU.h 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WTF/wtf/text/LineBreakIteratorPoolICU.h 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -60,11 +60,11 @@
</span><span class="cx"> return locale;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- TextBreakIterator* take(const AtomicString& locale, LineBreakIteratorMode mode, bool isCJK)
</del><ins>+ UBreakIterator* take(const AtomicString& locale, LineBreakIteratorMode mode, bool isCJK)
</ins><span class="cx"> {
</span><span class="cx"> auto localeWithOptionalBreakKeyword = makeLocaleWithBreakKeyword(locale, mode);
</span><span class="cx">
</span><del>- TextBreakIterator* iterator = nullptr;
</del><ins>+ UBreakIterator* iterator = nullptr;
</ins><span class="cx"> for (size_t i = 0; i < m_pool.size(); ++i) {
</span><span class="cx"> if (m_pool[i].first == localeWithOptionalBreakKeyword) {
</span><span class="cx"> iterator = m_pool[i].second;
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> return iterator;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void put(TextBreakIterator* iterator)
</del><ins>+ void put(UBreakIterator* iterator)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_vendedIterators.contains(iterator));
</span><span class="cx"> if (m_pool.size() == capacity) {
</span><span class="lines">@@ -97,8 +97,8 @@
</span><span class="cx"> private:
</span><span class="cx"> static constexpr size_t capacity = 4;
</span><span class="cx">
</span><del>- Vector<std::pair<AtomicString, TextBreakIterator*>, capacity> m_pool;
- HashMap<TextBreakIterator*, AtomicString> m_vendedIterators;
</del><ins>+ Vector<std::pair<AtomicString, UBreakIterator*>, capacity> m_pool;
+ HashMap<UBreakIterator*, AtomicString> m_vendedIterators;
</ins><span class="cx">
</span><span class="cx"> friend WTF::ThreadSpecific<LineBreakIteratorPool>::operator LineBreakIteratorPool*();
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WTF/wtf/text/StringView.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "StringView.h"
</span><span class="cx">
</span><span class="cx"> #include <mutex>
</span><ins>+#include <unicode/ubrk.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Lock.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -131,7 +132,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> if (m_index == m_stringView.length())
</span><span class="cx"> return m_index;
</span><del>- return textBreakFollowing(m_iterator.value(), m_index);
</del><ins>+ return ubrk_following(m_iterator.value(), m_index);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWTFwtftextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/TextBreakIterator.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/TextBreakIterator.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WTF/wtf/text/TextBreakIterator.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -38,10 +38,10 @@
</span><span class="cx">
</span><span class="cx"> // Iterator initialization
</span><span class="cx">
</span><del>-static TextBreakIterator* initializeIterator(UBreakIteratorType type, const char* locale = currentTextBreakLocaleID())
</del><ins>+static UBreakIterator* initializeIterator(UBreakIteratorType type, const char* locale = currentTextBreakLocaleID())
</ins><span class="cx"> {
</span><span class="cx"> UErrorCode openStatus = U_ZERO_ERROR;
</span><del>- TextBreakIterator* iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, locale, 0, 0, &openStatus));
</del><ins>+ UBreakIterator* iterator = ubrk_open(type, locale, 0, 0, &openStatus);
</ins><span class="cx"> ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
</span><span class="cx"> return iterator;
</span><span class="cx"> }
</span><span class="lines">@@ -48,13 +48,13 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><del>-static TextBreakIterator* initializeIteratorWithRules(const char* breakRules)
</del><ins>+static UBreakIterator* initializeIteratorWithRules(const char* breakRules)
</ins><span class="cx"> {
</span><span class="cx"> UParseError parseStatus;
</span><span class="cx"> UErrorCode openStatus = U_ZERO_ERROR;
</span><span class="cx"> unsigned length = strlen(breakRules);
</span><span class="cx"> auto upconvertedCharacters = StringView(reinterpret_cast<const LChar*>(breakRules), length).upconvertedCharacters();
</span><del>- TextBreakIterator* iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(upconvertedCharacters, length, 0, 0, &parseStatus, &openStatus));
</del><ins>+ UBreakIterator* iterator = ubrk_openRules(upconvertedCharacters, length, 0, 0, &parseStatus, &openStatus);
</ins><span class="cx"> ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
</span><span class="cx"> return iterator;
</span><span class="cx"> }
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> // Iterator text setting
</span><span class="cx">
</span><del>-static TextBreakIterator* setTextForIterator(TextBreakIterator& iterator, StringView string)
</del><ins>+static UBreakIterator* setTextForIterator(UBreakIterator& iterator, StringView string)
</ins><span class="cx"> {
</span><span class="cx"> if (string.is8Bit()) {
</span><span class="cx"> UTextWithBuffer textLocal;
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UErrorCode setTextStatus = U_ZERO_ERROR;
</span><del>- ubrk_setUText(reinterpret_cast<UBreakIterator*>(&iterator), text, &setTextStatus);
</del><ins>+ ubrk_setUText(&iterator, text, &setTextStatus);
</ins><span class="cx"> if (U_FAILURE(setTextStatus)) {
</span><span class="cx"> LOG_ERROR("ubrk_setUText failed with status %d", setTextStatus);
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> utext_close(text);
</span><span class="cx"> } else {
</span><span class="cx"> UErrorCode setTextStatus = U_ZERO_ERROR;
</span><del>- ubrk_setText(reinterpret_cast<UBreakIterator*>(&iterator), string.characters16(), string.length(), &setTextStatus);
</del><ins>+ ubrk_setText(&iterator, string.characters16(), string.length(), &setTextStatus);
</ins><span class="cx"> if (U_FAILURE(setTextStatus))
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> return &iterator;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static TextBreakIterator* setContextAwareTextForIterator(TextBreakIterator& iterator, StringView string, const UChar* priorContext, unsigned priorContextLength)
</del><ins>+static UBreakIterator* setContextAwareTextForIterator(UBreakIterator& iterator, StringView string, const UChar* priorContext, unsigned priorContextLength)
</ins><span class="cx"> {
</span><span class="cx"> if (string.is8Bit()) {
</span><span class="cx"> UTextWithBuffer textLocal;
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UErrorCode setTextStatus = U_ZERO_ERROR;
</span><del>- ubrk_setUText(reinterpret_cast<UBreakIterator*>(&iterator), text, &setTextStatus);
</del><ins>+ ubrk_setUText(&iterator, text, &setTextStatus);
</ins><span class="cx"> if (U_FAILURE(setTextStatus)) {
</span><span class="cx"> LOG_ERROR("ubrk_setUText failed with status %d", setTextStatus);
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UErrorCode setTextStatus = U_ZERO_ERROR;
</span><del>- ubrk_setUText(reinterpret_cast<UBreakIterator*>(&iterator), text, &setTextStatus);
</del><ins>+ ubrk_setUText(&iterator, text, &setTextStatus);
</ins><span class="cx"> if (U_FAILURE(setTextStatus)) {
</span><span class="cx"> LOG_ERROR("ubrk_setUText failed with status %d", setTextStatus);
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -146,9 +146,9 @@
</span><span class="cx">
</span><span class="cx"> // Static iterators
</span><span class="cx">
</span><del>-TextBreakIterator* wordBreakIterator(StringView string)
</del><ins>+UBreakIterator* wordBreakIterator(StringView string)
</ins><span class="cx"> {
</span><del>- static TextBreakIterator* staticWordBreakIterator = initializeIterator(UBRK_WORD);
</del><ins>+ static UBreakIterator* staticWordBreakIterator = initializeIterator(UBRK_WORD);
</ins><span class="cx"> if (!staticWordBreakIterator)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -155,9 +155,9 @@
</span><span class="cx"> return setTextForIterator(*staticWordBreakIterator, string);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextBreakIterator* sentenceBreakIterator(StringView string)
</del><ins>+UBreakIterator* sentenceBreakIterator(StringView string)
</ins><span class="cx"> {
</span><del>- static TextBreakIterator* staticSentenceBreakIterator = initializeIterator(UBRK_SENTENCE);
</del><ins>+ static UBreakIterator* staticSentenceBreakIterator = initializeIterator(UBRK_SENTENCE);
</ins><span class="cx"> if (!staticSentenceBreakIterator)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> return setTextForIterator(*staticSentenceBreakIterator, string);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextBreakIterator* cursorMovementIterator(StringView string)
</del><ins>+UBreakIterator* cursorMovementIterator(StringView string)
</ins><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> // This rule set is based on character-break iterator rules of ICU 57
</span><span class="lines">@@ -291,10 +291,10 @@
</span><span class="cx"> "!!safe_reverse;"
</span><span class="cx"> "!!safe_forward;";
</span><span class="cx"> #endif
</span><del>- static TextBreakIterator* staticCursorMovementIterator = initializeIteratorWithRules(kRules);
</del><ins>+ static UBreakIterator* staticCursorMovementIterator = initializeIteratorWithRules(kRules);
</ins><span class="cx"> #else // PLATFORM(IOS)
</span><span class="cx"> // Use the special Thai character break iterator for all locales
</span><del>- static TextBreakIterator* staticCursorMovementIterator = initializeIterator(UBRK_CHARACTER, "th");
</del><ins>+ static UBreakIterator* staticCursorMovementIterator = initializeIterator(UBRK_CHARACTER, "th");
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> if (!staticCursorMovementIterator)
</span><span class="lines">@@ -303,9 +303,9 @@
</span><span class="cx"> return setTextForIterator(*staticCursorMovementIterator, string);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextBreakIterator* acquireLineBreakIterator(StringView string, const AtomicString& locale, const UChar* priorContext, unsigned priorContextLength, LineBreakIteratorMode mode, bool isCJK)
</del><ins>+UBreakIterator* acquireLineBreakIterator(StringView string, const AtomicString& locale, const UChar* priorContext, unsigned priorContextLength, LineBreakIteratorMode mode, bool isCJK)
</ins><span class="cx"> {
</span><del>- TextBreakIterator* iterator = LineBreakIteratorPool::sharedPool().take(locale, mode, isCJK);
</del><ins>+ UBreakIterator* iterator = LineBreakIteratorPool::sharedPool().take(locale, mode, isCJK);
</ins><span class="cx"> if (!iterator)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> return setContextAwareTextForIterator(*iterator, string, priorContext, priorContextLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void releaseLineBreakIterator(TextBreakIterator* iterator)
</del><ins>+void releaseLineBreakIterator(UBreakIterator* iterator)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(iterator, iterator);
</span><span class="cx">
</span><span class="lines">@@ -780,7 +780,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextBreakIterator* openLineBreakIterator(const AtomicString& locale, LineBreakIteratorMode mode, bool isCJK)
</del><ins>+UBreakIterator* openLineBreakIterator(const AtomicString& locale, LineBreakIteratorMode mode, bool isCJK)
</ins><span class="cx"> {
</span><span class="cx"> UBreakIterator* ubrkIter;
</span><span class="cx"> UErrorCode openStatus = U_ZERO_ERROR;
</span><span class="lines">@@ -804,20 +804,20 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return reinterpret_cast<TextBreakIterator*>(ubrkIter);
</del><ins>+ return ubrkIter;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void closeLineBreakIterator(TextBreakIterator*& iterator)
</del><ins>+void closeLineBreakIterator(UBreakIterator*& iterator)
</ins><span class="cx"> {
</span><del>- UBreakIterator* ubrkIter = reinterpret_cast<UBreakIterator*>(iterator);
</del><ins>+ UBreakIterator* ubrkIter = iterator;
</ins><span class="cx"> ASSERT(ubrkIter);
</span><span class="cx"> ubrk_close(ubrkIter);
</span><span class="cx"> iterator = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::atomic<TextBreakIterator*> nonSharedCharacterBreakIterator = ATOMIC_VAR_INIT(nullptr);
</del><ins>+static std::atomic<UBreakIterator*> nonSharedCharacterBreakIterator = ATOMIC_VAR_INIT(nullptr);
</ins><span class="cx">
</span><del>-static inline TextBreakIterator* getNonSharedCharacterBreakIterator()
</del><ins>+static inline UBreakIterator* getNonSharedCharacterBreakIterator()
</ins><span class="cx"> {
</span><span class="cx"> if (auto *res = nonSharedCharacterBreakIterator.exchange(nullptr, std::memory_order_acquire))
</span><span class="cx"> return res;
</span><span class="lines">@@ -824,10 +824,10 @@
</span><span class="cx"> return initializeIterator(UBRK_CHARACTER);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void cacheNonSharedCharacterBreakIterator(TextBreakIterator* cacheMe)
</del><ins>+static inline void cacheNonSharedCharacterBreakIterator(UBreakIterator* cacheMe)
</ins><span class="cx"> {
</span><span class="cx"> if (auto *old = nonSharedCharacterBreakIterator.exchange(cacheMe, std::memory_order_release))
</span><del>- ubrk_close(reinterpret_cast<UBreakIterator*>(old));
</del><ins>+ ubrk_close(old);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator(StringView string)
</span><span class="lines">@@ -848,52 +848,11 @@
</span><span class="cx"> std::swap(m_iterator, other.m_iterator);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> // Iterator implemenation.
</span><span class="cx">
</span><del>-int textBreakFirst(TextBreakIterator* iterator)
</del><ins>+bool isWordTextBreak(UBreakIterator* iterator)
</ins><span class="cx"> {
</span><del>- return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
-}
-
-int textBreakLast(TextBreakIterator* iterator)
-{
- return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
-}
-
-int textBreakNext(TextBreakIterator* iterator)
-{
- return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
-}
-
-int textBreakPrevious(TextBreakIterator* iterator)
-{
- return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
-}
-
-int textBreakPreceding(TextBreakIterator* iterator, int pos)
-{
- return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
-}
-
-int textBreakFollowing(TextBreakIterator* iterator, int pos)
-{
- return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
-}
-
-int textBreakCurrent(TextBreakIterator* iterator)
-{
- return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
-}
-
-bool isTextBreak(TextBreakIterator* iterator, int position)
-{
- return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
-}
-
-bool isWordTextBreak(TextBreakIterator* iterator)
-{
- int ruleStatus = ubrk_getRuleStatus(reinterpret_cast<UBreakIterator*>(iterator));
</del><ins>+ int ruleStatus = ubrk_getRuleStatus(iterator);
</ins><span class="cx"> return ruleStatus != UBRK_WORD_NONE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -920,7 +879,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned numGraphemeClusters = 0;
</span><del>- while (textBreakNext(iterator) != TextBreakDone)
</del><ins>+ while (ubrk_next(iterator) != UBRK_DONE)
</ins><span class="cx"> ++numGraphemeClusters;
</span><span class="cx"> return numGraphemeClusters;
</span><span class="cx"> }
</span><span class="lines">@@ -948,10 +907,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < numGraphemeClusters; ++i) {
</span><del>- if (textBreakNext(iterator) == TextBreakDone)
</del><ins>+ if (ubrk_next(iterator) == UBRK_DONE)
</ins><span class="cx"> return stringLength;
</span><span class="cx"> }
</span><del>- return textBreakCurrent(iterator);
</del><ins>+ return ubrk_current(iterator);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtftextTextBreakIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/TextBreakIterator.h (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/TextBreakIterator.h 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WTF/wtf/text/TextBreakIterator.h 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-class TextBreakIterator;
-
</del><span class="cx"> // Note: The returned iterator is good only until you get another iterator, with the exception of acquireLineBreakIterator.
</span><span class="cx">
</span><span class="cx"> enum class LineBreakIteratorMode { Default, Loose, Normal, Strict };
</span><span class="lines">@@ -35,28 +33,18 @@
</span><span class="cx"> // platform UI conventions. One notable example where this can be different
</span><span class="cx"> // from character break iterator is Thai prepend characters, see bug 24342.
</span><span class="cx"> // Use this for insertion point and selection manipulations.
</span><del>-WTF_EXPORT_PRIVATE TextBreakIterator* cursorMovementIterator(StringView);
</del><ins>+WTF_EXPORT_PRIVATE UBreakIterator* cursorMovementIterator(StringView);
</ins><span class="cx">
</span><del>-WTF_EXPORT_PRIVATE TextBreakIterator* wordBreakIterator(StringView);
-WTF_EXPORT_PRIVATE TextBreakIterator* sentenceBreakIterator(StringView);
</del><ins>+WTF_EXPORT_PRIVATE UBreakIterator* wordBreakIterator(StringView);
+WTF_EXPORT_PRIVATE UBreakIterator* sentenceBreakIterator(StringView);
</ins><span class="cx">
</span><del>-WTF_EXPORT_PRIVATE TextBreakIterator* acquireLineBreakIterator(StringView, const AtomicString& locale, const UChar* priorContext, unsigned priorContextLength, LineBreakIteratorMode, bool isCJK);
-WTF_EXPORT_PRIVATE void releaseLineBreakIterator(TextBreakIterator*);
-TextBreakIterator* openLineBreakIterator(const AtomicString& locale, LineBreakIteratorMode, bool isCJK);
-void closeLineBreakIterator(TextBreakIterator*&);
</del><ins>+WTF_EXPORT_PRIVATE UBreakIterator* acquireLineBreakIterator(StringView, const AtomicString& locale, const UChar* priorContext, unsigned priorContextLength, LineBreakIteratorMode, bool isCJK);
+WTF_EXPORT_PRIVATE void releaseLineBreakIterator(UBreakIterator*);
+UBreakIterator* openLineBreakIterator(const AtomicString& locale, LineBreakIteratorMode, bool isCJK);
+void closeLineBreakIterator(UBreakIterator*&);
</ins><span class="cx">
</span><del>-WTF_EXPORT_PRIVATE int textBreakFirst(TextBreakIterator*);
-WTF_EXPORT_PRIVATE int textBreakLast(TextBreakIterator*);
-WTF_EXPORT_PRIVATE int textBreakNext(TextBreakIterator*);
-WTF_EXPORT_PRIVATE int textBreakPrevious(TextBreakIterator*);
-WTF_EXPORT_PRIVATE int textBreakCurrent(TextBreakIterator*);
-WTF_EXPORT_PRIVATE int textBreakPreceding(TextBreakIterator*, int);
-WTF_EXPORT_PRIVATE int textBreakFollowing(TextBreakIterator*, int);
-WTF_EXPORT_PRIVATE bool isTextBreak(TextBreakIterator*, int);
-WTF_EXPORT_PRIVATE bool isWordTextBreak(TextBreakIterator*);
</del><ins>+WTF_EXPORT_PRIVATE bool isWordTextBreak(UBreakIterator*);
</ins><span class="cx">
</span><del>-constexpr int TextBreakDone = -1;
-
</del><span class="cx"> WTF_EXPORT_PRIVATE bool isCJKLocale(const AtomicString&);
</span><span class="cx">
</span><span class="cx"> class LazyLineBreakIterator {
</span><span class="lines">@@ -86,19 +74,19 @@
</span><span class="cx">
</span><span class="cx"> UChar lastCharacter() const
</span><span class="cx"> {
</span><del>- COMPILE_ASSERT(WTF_ARRAY_LENGTH(m_priorContext) == 2, TextBreakIterator_unexpected_prior_context_length);
</del><ins>+ static_assert(WTF_ARRAY_LENGTH(m_priorContext) == 2, "UBreakIterator unexpected prior context length");
</ins><span class="cx"> return m_priorContext[1];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UChar secondToLastCharacter() const
</span><span class="cx"> {
</span><del>- COMPILE_ASSERT(WTF_ARRAY_LENGTH(m_priorContext) == 2, TextBreakIterator_unexpected_prior_context_length);
</del><ins>+ static_assert(WTF_ARRAY_LENGTH(m_priorContext) == 2, "UBreakIterator unexpected prior context length");
</ins><span class="cx"> return m_priorContext[0];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setPriorContext(UChar last, UChar secondToLast)
</span><span class="cx"> {
</span><del>- COMPILE_ASSERT(WTF_ARRAY_LENGTH(m_priorContext) == 2, TextBreakIterator_unexpected_prior_context_length);
</del><ins>+ static_assert(WTF_ARRAY_LENGTH(m_priorContext) == 2, "UBreakIterator unexpected prior context length");
</ins><span class="cx"> m_priorContext[0] = secondToLast;
</span><span class="cx"> m_priorContext[1] = last;
</span><span class="cx"> }
</span><span class="lines">@@ -105,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> void updatePriorContext(UChar last)
</span><span class="cx"> {
</span><del>- COMPILE_ASSERT(WTF_ARRAY_LENGTH(m_priorContext) == 2, TextBreakIterator_unexpected_prior_context_length);
</del><ins>+ static_assert(WTF_ARRAY_LENGTH(m_priorContext) == 2, "UBreakIterator unexpected prior context length");
</ins><span class="cx"> m_priorContext[0] = m_priorContext[1];
</span><span class="cx"> m_priorContext[1] = last;
</span><span class="cx"> }
</span><span class="lines">@@ -112,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> void resetPriorContext()
</span><span class="cx"> {
</span><del>- COMPILE_ASSERT(WTF_ARRAY_LENGTH(m_priorContext) == 2, TextBreakIterator_unexpected_prior_context_length);
</del><ins>+ static_assert(WTF_ARRAY_LENGTH(m_priorContext) == 2, "UBreakIterator unexpected prior context length");
</ins><span class="cx"> m_priorContext[0] = 0;
</span><span class="cx"> m_priorContext[1] = 0;
</span><span class="cx"> }
</span><span class="lines">@@ -120,7 +108,7 @@
</span><span class="cx"> unsigned priorContextLength() const
</span><span class="cx"> {
</span><span class="cx"> unsigned priorContextLength = 0;
</span><del>- COMPILE_ASSERT(WTF_ARRAY_LENGTH(m_priorContext) == 2, TextBreakIterator_unexpected_prior_context_length);
</del><ins>+ static_assert(WTF_ARRAY_LENGTH(m_priorContext) == 2, "UBreakIterator unexpected prior context length");
</ins><span class="cx"> if (m_priorContext[1]) {
</span><span class="cx"> ++priorContextLength;
</span><span class="cx"> if (m_priorContext[0])
</span><span class="lines">@@ -132,7 +120,7 @@
</span><span class="cx"> // Obtain text break iterator, possibly previously cached, where this iterator is (or has been)
</span><span class="cx"> // initialized to use the previously stored string as the primary breaking context and using
</span><span class="cx"> // previously stored prior context if non-empty.
</span><del>- TextBreakIterator* get(unsigned priorContextLength)
</del><ins>+ UBreakIterator* get(unsigned priorContextLength)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(priorContextLength <= priorContextCapacity);
</span><span class="cx"> const UChar* priorContext = priorContextLength ? &m_priorContext[priorContextCapacity - priorContextLength] : 0;
</span><span class="lines">@@ -164,7 +152,7 @@
</span><span class="cx"> static constexpr unsigned priorContextCapacity = 2;
</span><span class="cx"> StringView m_stringView;
</span><span class="cx"> AtomicString m_locale;
</span><del>- TextBreakIterator* m_iterator { nullptr };
</del><ins>+ UBreakIterator* m_iterator { nullptr };
</ins><span class="cx"> const UChar* m_cachedPriorContext { nullptr };
</span><span class="cx"> LineBreakIteratorMode m_mode { LineBreakIteratorMode::Default };
</span><span class="cx"> unsigned m_cachedPriorContextLength { 0 };
</span><span class="lines">@@ -185,10 +173,10 @@
</span><span class="cx">
</span><span class="cx"> NonSharedCharacterBreakIterator(NonSharedCharacterBreakIterator&&);
</span><span class="cx">
</span><del>- operator TextBreakIterator*() const { return m_iterator; }
</del><ins>+ operator UBreakIterator*() const { return m_iterator; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- TextBreakIterator* m_iterator;
</del><ins>+ UBreakIterator* m_iterator;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Counts the number of grapheme clusters. A surrogate pair or a sequence
</span><span class="lines">@@ -205,5 +193,4 @@
</span><span class="cx"> using WTF::LazyLineBreakIterator;
</span><span class="cx"> using WTF::LineBreakIteratorMode;
</span><span class="cx"> using WTF::NonSharedCharacterBreakIterator;
</span><del>-using WTF::TextBreakDone;
-using WTF::TextBreakIterator;
</del><ins>+using WTF::isWordTextBreak;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/ChangeLog 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2016-12-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Stop reinterpret_casting UBreakIterators to the undefined type TextBreakIterator
+ https://bugs.webkit.org/show_bug.cgi?id=165931
+
+ Reviewed by Alex Christensen.
+
+ No new tests because there is no behavior change.
+
+ * dom/CharacterData.cpp:
+ (WebCore::CharacterData::parserAppendData):
+ * editing/TextCheckingHelper.cpp:
+ (WebCore::findMisspellings):
+ * editing/VisibleUnits.cpp:
+ (WebCore::wordBreakIteratorForMinOffsetBoundary):
+ (WebCore::wordBreakIteratorForMaxOffsetBoundary):
+ (WebCore::isLogicalStartOfWord):
+ (WebCore::islogicalEndOfWord):
+ (WebCore::visualWordPosition):
+ (WebCore::startSentenceBoundary):
+ (WebCore::endSentenceBoundary):
+ (WebCore::previousSentencePositionBoundary):
+ (WebCore::nextSentencePositionBoundary):
+ * html/HTMLInputElement.cpp:
+ * html/HTMLTextAreaElement.cpp:
+ * html/InputType.cpp:
+ * html/TextFieldInputType.cpp:
+ * html/TextInputType.cpp:
+ * platform/graphics/StringTruncator.cpp:
+ (WebCore::textBreakAtOrPreceding):
+ (WebCore::boundedTextBreakFollowing):
+ (WebCore::rightClipToWordBuffer):
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::offsetForPosition):
+ * platform/text/TextBoundaries.cpp:
+ (WebCore::findNextWordFromIndex):
+ (WebCore::findWordBoundary):
+ (WebCore::findEndWordBoundary):
+ * platform/text/mac/TextBoundaries.mm:
+ (WebCore::findNextWordFromIndex):
+ * rendering/BreakLines.h:
+ (WebCore::nextBreakablePositionNonLoosely):
+ (WebCore::nextBreakablePositionLoosely):
+ * rendering/RenderBlock.cpp:
+ * rendering/RenderText.cpp:
+ (WebCore::makeCapitalized):
+ (WebCore::RenderText::previousOffset):
+ (WebCore::RenderText::previousOffsetForBackwardDeletion):
+ (WebCore::RenderText::nextOffset):
+ * rendering/SimpleLineLayoutTextFragmentIterator.h:
+ * rendering/line/LineBreaker.h:
+
</ins><span class="cx"> 2016-12-15 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Use asString instead of toWTFString, toString, or getString when we already checked isString
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/dom/CharacterData.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> #include "ProcessingInstruction.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "StyleInheritedData.h"
</span><ins>+#include <unicode/ubrk.h>
</ins><span class="cx"> #include <wtf/Ref.h>
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx"> // We need at least two characters look-ahead to account for UTF-16 surrogates.
</span><span class="cx"> if (characterLengthLimit < characterLength) {
</span><span class="cx"> NonSharedCharacterBreakIterator it(StringView(string).substring(offset, (characterLengthLimit + 2 > characterLength) ? characterLength : characterLengthLimit + 2));
</span><del>- if (!isTextBreak(it, characterLengthLimit))
- characterLengthLimit = textBreakPreceding(it, characterLengthLimit);
</del><ins>+ if (!ubrk_isBoundary(it, characterLengthLimit))
+ characterLengthLimit = ubrk_preceding(it, characterLengthLimit);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!characterLengthLimit)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextCheckingHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextCheckingHelper.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -33,12 +33,13 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><span class="cx"> #include "Settings.h"
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx"> #include "TextCheckerClient.h"
</span><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "VisiblePosition.h"
</span><span class="cx"> #include "VisibleUnits.h"
</span><ins>+#include <unicode/ubrk.h>
</ins><span class="cx"> #include <wtf/text/StringView.h>
</span><ins>+#include <wtf/text/TextBreakIterator.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -76,11 +77,11 @@
</span><span class="cx">
</span><span class="cx"> static void findMisspellings(TextCheckerClient& client, StringView text, Vector<TextCheckingResult>& results)
</span><span class="cx"> {
</span><del>- TextBreakIterator* iterator = wordBreakIterator(text);
</del><ins>+ UBreakIterator* iterator = wordBreakIterator(text);
</ins><span class="cx"> if (!iterator)
</span><span class="cx"> return;
</span><del>- for (int wordStart = textBreakCurrent(iterator); wordStart >= 0; ) {
- int wordEnd = textBreakNext(iterator);
</del><ins>+ for (int wordStart = ubrk_current(iterator); wordStart >= 0; ) {
+ int wordEnd = ubrk_next(iterator);
</ins><span class="cx"> if (wordEnd < 0)
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -37,9 +37,10 @@
</span><span class="cx"> #include "RenderedPosition.h"
</span><span class="cx"> #include "Text.h"
</span><span class="cx"> #include "TextBoundaries.h"
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "VisibleSelection.h"
</span><ins>+#include <unicode/ubrk.h>
+#include <wtf/text/TextBreakIterator.h>
</ins><span class="cx"> #include "htmlediting.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -285,7 +286,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static TextBreakIterator* wordBreakIteratorForMinOffsetBoundary(const VisiblePosition& visiblePosition, const InlineTextBox* textBox,
</del><ins>+static UBreakIterator* wordBreakIteratorForMinOffsetBoundary(const VisiblePosition& visiblePosition, const InlineTextBox* textBox,
</ins><span class="cx"> int& previousBoxLength, bool& previousBoxInDifferentBlock, Vector<UChar, 1024>& string, CachedLogicallyOrderedLeafBoxes& leafBoxes)
</span><span class="cx"> {
</span><span class="cx"> previousBoxInDifferentBlock = false;
</span><span class="lines">@@ -305,7 +306,7 @@
</span><span class="cx"> return wordBreakIterator(StringView(string.data(), string.size()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static TextBreakIterator* wordBreakIteratorForMaxOffsetBoundary(const VisiblePosition& visiblePosition, const InlineTextBox* textBox,
</del><ins>+static UBreakIterator* wordBreakIteratorForMaxOffsetBoundary(const VisiblePosition& visiblePosition, const InlineTextBox* textBox,
</ins><span class="cx"> bool& nextBoxInDifferentBlock, Vector<UChar, 1024>& string, CachedLogicallyOrderedLeafBoxes& leafBoxes)
</span><span class="cx"> {
</span><span class="cx"> nextBoxInDifferentBlock = false;
</span><span class="lines">@@ -323,20 +324,20 @@
</span><span class="cx"> return wordBreakIterator(StringView(string.data(), string.size()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool isLogicalStartOfWord(TextBreakIterator* iter, int position, bool hardLineBreak)
</del><ins>+static bool isLogicalStartOfWord(UBreakIterator* iter, int position, bool hardLineBreak)
</ins><span class="cx"> {
</span><del>- bool boundary = hardLineBreak ? true : isTextBreak(iter, position);
</del><ins>+ bool boundary = hardLineBreak ? true : ubrk_isBoundary(iter, position);
</ins><span class="cx"> if (!boundary)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- textBreakFollowing(iter, position);
</del><ins>+ ubrk_following(iter, position);
</ins><span class="cx"> // isWordTextBreak returns true after moving across a word and false after moving across a punctuation/space.
</span><span class="cx"> return isWordTextBreak(iter);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool islogicalEndOfWord(TextBreakIterator* iter, int position, bool hardLineBreak)
</del><ins>+static bool islogicalEndOfWord(UBreakIterator* iter, int position, bool hardLineBreak)
</ins><span class="cx"> {
</span><del>- bool boundary = isTextBreak(iter, position);
</del><ins>+ bool boundary = ubrk_isBoundary(iter, position);
</ins><span class="cx"> return (hardLineBreak || boundary) && isWordTextBreak(iter);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -351,7 +352,7 @@
</span><span class="cx"> TextDirection blockDirection = directionOfEnclosingBlock(visiblePosition.deepEquivalent());
</span><span class="cx"> InlineBox* previouslyVisitedBox = nullptr;
</span><span class="cx"> VisiblePosition current = visiblePosition;
</span><del>- TextBreakIterator* iter = nullptr;
</del><ins>+ UBreakIterator* iter = nullptr;
</ins><span class="cx">
</span><span class="cx"> CachedLogicallyOrderedLeafBoxes leafBoxes;
</span><span class="cx"> Vector<UChar, 1024> string;
</span><span class="lines">@@ -390,7 +391,7 @@
</span><span class="cx"> if (!iter)
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- textBreakFirst(iter);
</del><ins>+ ubrk_first(iter);
</ins><span class="cx"> int offsetInIterator = offsetInBox - textBox.start() + previousBoxLength;
</span><span class="cx">
</span><span class="cx"> bool isWordBreak;
</span><span class="lines">@@ -1109,7 +1110,7 @@
</span><span class="cx"> unsigned startSentenceBoundary(StringView text, unsigned, BoundarySearchContextAvailability, bool&)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: The following function can return -1; we don't handle that.
</span><del>- return textBreakPreceding(sentenceBreakIterator(text), text.length());
</del><ins>+ return ubrk_preceding(sentenceBreakIterator(text), text.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VisiblePosition startOfSentence(const VisiblePosition& position)
</span><span class="lines">@@ -1119,7 +1120,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned endSentenceBoundary(StringView text, unsigned, BoundarySearchContextAvailability, bool&)
</span><span class="cx"> {
</span><del>- return textBreakNext(sentenceBreakIterator(text));
</del><ins>+ return ubrk_next(sentenceBreakIterator(text));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VisiblePosition endOfSentence(const VisiblePosition& position)
</span><span class="lines">@@ -1132,7 +1133,7 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This is identical to startSentenceBoundary. I'm pretty sure that's not right.
</span><span class="cx"> // FIXME: The following function can return -1; we don't handle that.
</span><del>- return textBreakPreceding(sentenceBreakIterator(text), text.length());
</del><ins>+ return ubrk_preceding(sentenceBreakIterator(text), text.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VisiblePosition previousSentencePosition(const VisiblePosition& position)
</span><span class="lines">@@ -1144,7 +1145,7 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This is identical to endSentenceBoundary.
</span><span class="cx"> // That isn't right. This function needs to move to the equivalent position in the following sentence.
</span><del>- return textBreakFollowing(sentenceBreakIterator(text), 0);
</del><ins>+ return ubrk_following(sentenceBreakIterator(text), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VisiblePosition nextSentencePosition(const VisiblePosition& position)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> #include "TouchEvent.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextAreaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> #include "RenderTextControlMultiLine.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "Text.h"
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx"> #include "TextControlInnerElements.h"
</span><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "TextNodeTraversal.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/html/InputType.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "SubmitInputType.h"
</span><span class="cx"> #include "TelephoneInputType.h"
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx"> #include "TextInputType.h"
</span><span class="cx"> #include "TimeInputType.h"
</span><span class="cx"> #include "URLInputType.h"
</span><span class="lines">@@ -78,6 +77,7 @@
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><ins>+#include <wtf/text/TextBreakIterator.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> #include "RenderTextControlSingleLine.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx"> #include "TextControlInnerElements.h"
</span><span class="cx"> #include "TextEvent.h"
</span><span class="cx"> #include "TextIterator.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextInputType.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextInputType.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/html/TextInputType.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx">
</span><span class="cx"> #include "HTMLInputElement.h"
</span><span class="cx"> #include "InputTypeNames.h"
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsStringTruncatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/StringTruncator.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/StringTruncator.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/platform/graphics/StringTruncator.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "FontCascade.h"
</span><span class="cx"> #include <wtf/text/TextBreakIterator.h>
</span><span class="cx"> #include "TextRun.h"
</span><ins>+#include <unicode/ubrk.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="lines">@@ -43,19 +44,19 @@
</span><span class="cx">
</span><span class="cx"> typedef unsigned TruncationFunction(const String&, unsigned length, unsigned keepCount, UChar* buffer, bool shouldInsertEllipsis);
</span><span class="cx">
</span><del>-static inline int textBreakAtOrPreceding(TextBreakIterator* it, int offset)
</del><ins>+static inline int textBreakAtOrPreceding(UBreakIterator* it, int offset)
</ins><span class="cx"> {
</span><del>- if (isTextBreak(it, offset))
</del><ins>+ if (ubrk_isBoundary(it, offset))
</ins><span class="cx"> return offset;
</span><span class="cx">
</span><del>- int result = textBreakPreceding(it, offset);
- return result == TextBreakDone ? 0 : result;
</del><ins>+ int result = ubrk_preceding(it, offset);
+ return result == UBRK_DONE ? 0 : result;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline int boundedTextBreakFollowing(TextBreakIterator* it, int offset, int length)
</del><ins>+static inline int boundedTextBreakFollowing(UBreakIterator* it, int offset, int length)
</ins><span class="cx"> {
</span><del>- int result = textBreakFollowing(it, offset);
- return result == TextBreakDone ? length : result;
</del><ins>+ int result = ubrk_following(it, offset);
+ return result == UBRK_DONE ? length : result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static unsigned centerTruncateToBuffer(const String& string, unsigned length, unsigned keepCount, UChar* buffer, bool shouldInsertEllipsis)
</span><span class="lines">@@ -146,7 +147,7 @@
</span><span class="cx"> ASSERT(keepCount < length);
</span><span class="cx"> ASSERT(keepCount < STRING_BUFFER_SIZE);
</span><span class="cx">
</span><del>- TextBreakIterator* it = wordBreakIterator(StringView(string).substring(0, length));
</del><ins>+ UBreakIterator* it = wordBreakIterator(StringView(string).substring(0, length));
</ins><span class="cx"> unsigned keepLength = textBreakAtOrPreceding(it, keepCount);
</span><span class="cx"> StringView(string).substring(0, keepLength).getCharactersWithUpconvert(buffer);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -30,10 +30,11 @@
</span><span class="cx"> #include "FontCascade.h"
</span><span class="cx"> #include "RenderBlock.h"
</span><span class="cx"> #include "RenderText.h"
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx"> #include "TextRun.h"
</span><ins>+#include <unicode/ubrk.h>
</ins><span class="cx"> #include <wtf/Optional.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><ins>+#include <wtf/text/TextBreakIterator.h>
</ins><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -176,13 +177,13 @@
</span><span class="cx"> // could use the glyph's "ligature carets". This is available in CoreText via CTFontGetLigatureCaretPositions().
</span><span class="cx"> CFIndex hitIndex = hitGlyphStart + (hitGlyphEnd - hitGlyphStart) * (m_run.ltr() ? x / adjustedAdvance : 1 - x / adjustedAdvance);
</span><span class="cx"> int stringLength = complexTextRun.stringLength();
</span><del>- TextBreakIterator* cursorPositionIterator = cursorMovementIterator(StringView(complexTextRun.characters(), stringLength));
</del><ins>+ UBreakIterator* cursorPositionIterator = cursorMovementIterator(StringView(complexTextRun.characters(), stringLength));
</ins><span class="cx"> int clusterStart;
</span><del>- if (isTextBreak(cursorPositionIterator, hitIndex))
</del><ins>+ if (ubrk_isBoundary(cursorPositionIterator, hitIndex))
</ins><span class="cx"> clusterStart = hitIndex;
</span><span class="cx"> else {
</span><del>- clusterStart = textBreakPreceding(cursorPositionIterator, hitIndex);
- if (clusterStart == TextBreakDone)
</del><ins>+ clusterStart = ubrk_preceding(cursorPositionIterator, hitIndex);
+ if (clusterStart == UBRK_DONE)
</ins><span class="cx"> clusterStart = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -189,8 +190,8 @@
</span><span class="cx"> if (!includePartialGlyphs)
</span><span class="cx"> return complexTextRun.stringLocation() + clusterStart;
</span><span class="cx">
</span><del>- int clusterEnd = textBreakFollowing(cursorPositionIterator, hitIndex);
- if (clusterEnd == TextBreakDone)
</del><ins>+ int clusterEnd = ubrk_following(cursorPositionIterator, hitIndex);
+ if (clusterEnd == UBRK_DONE)
</ins><span class="cx"> clusterEnd = stringLength;
</span><span class="cx">
</span><span class="cx"> CGFloat clusterWidth;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBoundariescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBoundaries.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBoundaries.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/platform/text/TextBoundaries.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TextBoundaries.h"
</span><span class="cx">
</span><ins>+#include <unicode/ubrk.h>
</ins><span class="cx"> #include <wtf/text/StringImpl.h>
</span><span class="cx"> #include <wtf/text/TextBreakIterator.h>
</span><span class="cx">
</span><span class="lines">@@ -62,27 +63,27 @@
</span><span class="cx">
</span><span class="cx"> int findNextWordFromIndex(StringView text, int position, bool forward)
</span><span class="cx"> {
</span><del>- TextBreakIterator* it = wordBreakIterator(text);
</del><ins>+ UBreakIterator* it = wordBreakIterator(text);
</ins><span class="cx">
</span><span class="cx"> if (forward) {
</span><del>- position = textBreakFollowing(it, position);
- while (position != TextBreakDone) {
</del><ins>+ position = ubrk_following(it, position);
+ while (position != UBRK_DONE) {
</ins><span class="cx"> // We stop searching when the character preceeding the break is alphanumeric.
</span><span class="cx"> if (static_cast<unsigned>(position) < text.length() && u_isalnum(text[position - 1]))
</span><span class="cx"> return position;
</span><span class="cx">
</span><del>- position = textBreakFollowing(it, position);
</del><ins>+ position = ubrk_following(it, position);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return text.length();
</span><span class="cx"> } else {
</span><del>- position = textBreakPreceding(it, position);
- while (position != TextBreakDone) {
</del><ins>+ position = ubrk_preceding(it, position);
+ while (position != UBRK_DONE) {
</ins><span class="cx"> // We stop searching when the character following the break is alphanumeric.
</span><span class="cx"> if (position && u_isalnum(text[position]))
</span><span class="cx"> return position;
</span><span class="cx">
</span><del>- position = textBreakPreceding(it, position);
</del><ins>+ position = ubrk_preceding(it, position);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="lines">@@ -91,19 +92,19 @@
</span><span class="cx">
</span><span class="cx"> void findWordBoundary(StringView text, int position, int* start, int* end)
</span><span class="cx"> {
</span><del>- TextBreakIterator* it = wordBreakIterator(text);
- *end = textBreakFollowing(it, position);
</del><ins>+ UBreakIterator* it = wordBreakIterator(text);
+ *end = ubrk_following(it, position);
</ins><span class="cx"> if (*end < 0)
</span><del>- *end = textBreakLast(it);
- *start = textBreakPrevious(it);
</del><ins>+ *end = ubrk_last(it);
+ *start = ubrk_previous(it);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void findEndWordBoundary(StringView text, int position, int* end)
</span><span class="cx"> {
</span><del>- TextBreakIterator* it = wordBreakIterator(text);
- *end = textBreakFollowing(it, position);
</del><ins>+ UBreakIterator* it = wordBreakIterator(text);
+ *end = ubrk_following(it, position);
</ins><span class="cx"> if (*end < 0)
</span><del>- *end = textBreakLast(it);
</del><ins>+ *end = ubrk_last(it);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // !PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextenchantTextCheckerEnchantcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx">
</span><span class="cx"> #include <Language.h>
</span><span class="cx"> #include <glib.h>
</span><ins>+#include <unicode/ubrk.h>
</ins><span class="cx"> #include <wtf/text/TextBreakIterator.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -91,13 +92,13 @@
</span><span class="cx"> if (!hasDictionary())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- TextBreakIterator* iter = wordBreakIterator(string);
</del><ins>+ UBreakIterator* iter = wordBreakIterator(string);
</ins><span class="cx"> if (!iter)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> CString utf8String = string.utf8();
</span><del>- int start = textBreakFirst(iter);
- for (int end = textBreakNext(iter); end != TextBreakDone; end = textBreakNext(iter)) {
</del><ins>+ int start = ubrk_first(iter);
+ for (int end = ubrk_next(iter); end != UBRK_DONE; end = ubrk_next(iter)) {
</ins><span class="cx"> if (isWordTextBreak(iter)) {
</span><span class="cx"> checkSpellingOfWord(utf8String, start, end, misspellingLocation, misspellingLength);
</span><span class="cx"> // Stop checking the next words If the current word is misspelled, to do not overwrite its misspelled location and length.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextmacTextBoundariesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -267,11 +267,11 @@
</span><span class="cx"> // for the contexts in which it is used on iPhone, and in the future will be
</span><span class="cx"> // tuned to improve the iPhone-specific behavior for the keyboard and text editing.
</span><span class="cx"> int pos = position;
</span><del>- TextBreakIterator* boundary = wordBreakIterator(text);
</del><ins>+ UBreakIterator* boundary = wordBreakIterator(text);
</ins><span class="cx"> if (boundary) {
</span><span class="cx"> if (forward) {
</span><span class="cx"> do {
</span><del>- pos = textBreakFollowing(boundary, pos);
</del><ins>+ pos = ubrk_following(boundary, pos);
</ins><span class="cx"> if (pos == UBRK_DONE)
</span><span class="cx"> pos = text.length();
</span><span class="cx"> } while (static_cast<unsigned>(pos) < text.length() && (pos == 0 || !isSkipCharacter(text[pos - 1])) && isSkipCharacter(text[pos]));
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> do {
</span><del>- pos = textBreakPreceding(boundary, pos);
</del><ins>+ pos = ubrk_preceding(boundary, pos);
</ins><span class="cx"> if (pos == UBRK_DONE)
</span><span class="cx"> pos = 0;
</span><span class="cx"> } while (pos > 0 && isSkipCharacter(text[pos]) && !isWhitespaceCharacter(text[pos - 1]));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingBreakLinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/BreakLines.h (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/BreakLines.h 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/rendering/BreakLines.h 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -102,10 +102,10 @@
</span><span class="cx"> if (!nextBreak || nextBreak.value() < i) {
</span><span class="cx"> // Don't break if positioned at start of primary context and there is no prior context.
</span><span class="cx"> if (i || priorContextLength) {
</span><del>- TextBreakIterator* breakIterator = lazyBreakIterator.get(priorContextLength);
</del><ins>+ UBreakIterator* breakIterator = lazyBreakIterator.get(priorContextLength);
</ins><span class="cx"> if (breakIterator) {
</span><del>- int candidate = textBreakFollowing(breakIterator, i - 1 + priorContextLength);
- if (candidate == TextBreakDone)
</del><ins>+ int candidate = ubrk_following(breakIterator, i - 1 + priorContextLength);
+ if (candidate == UBRK_DONE)
</ins><span class="cx"> nextBreak = std::nullopt;
</span><span class="cx"> else {
</span><span class="cx"> unsigned result = candidate;
</span><span class="lines">@@ -147,11 +147,11 @@
</span><span class="cx"> if (!nextBreak || nextBreak.value() < i) {
</span><span class="cx"> // Don't break if positioned at start of primary context and there is no prior context.
</span><span class="cx"> if (i || priorContextLength) {
</span><del>- TextBreakIterator* breakIterator = lazyBreakIterator.get(priorContextLength);
</del><ins>+ UBreakIterator* breakIterator = lazyBreakIterator.get(priorContextLength);
</ins><span class="cx"> if (breakIterator) {
</span><span class="cx"> ASSERT(i + priorContextLength >= 1);
</span><del>- int candidate = textBreakFollowing(breakIterator, i + priorContextLength - 1);
- if (candidate == TextBreakDone)
</del><ins>+ int candidate = ubrk_following(breakIterator, i + priorContextLength - 1);
+ if (candidate == UBRK_DONE)
</ins><span class="cx"> nextBreak = std::nullopt;
</span><span class="cx"> else {
</span><span class="cx"> unsigned result = candidate;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "ShapeOutsideInfo.h"
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx"> #include "TransformState.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> stringWithPrevious[i] = stringImpl[i - 1];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- TextBreakIterator* boundary = wordBreakIterator(StringView(stringWithPrevious.characters(), length + 1));
</del><ins>+ UBreakIterator* boundary = wordBreakIterator(StringView(stringWithPrevious.characters(), length + 1));
</ins><span class="cx"> if (!boundary)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -161,8 +161,8 @@
</span><span class="cx"> result.reserveCapacity(length);
</span><span class="cx">
</span><span class="cx"> int32_t endOfWord;
</span><del>- int32_t startOfWord = textBreakFirst(boundary);
- for (endOfWord = textBreakNext(boundary); endOfWord != TextBreakDone; startOfWord = endOfWord, endOfWord = textBreakNext(boundary)) {
</del><ins>+ int32_t startOfWord = ubrk_first(boundary);
+ for (endOfWord = ubrk_next(boundary); endOfWord != UBRK_DONE; startOfWord = endOfWord, endOfWord = ubrk_next(boundary)) {
</ins><span class="cx"> if (startOfWord) // Ignore first char of previous string
</span><span class="cx"> result.append(stringImpl[startOfWord - 1] == noBreakSpace ? noBreakSpace : u_totitle(stringWithPrevious[startOfWord]));
</span><span class="cx"> for (int i = startOfWord + 1; i < endOfWord; i++)
</span><span class="lines">@@ -1469,12 +1469,12 @@
</span><span class="cx"> return current - 1;
</span><span class="cx">
</span><span class="cx"> StringImpl* textImpl = m_text.impl();
</span><del>- TextBreakIterator* iterator = cursorMovementIterator(StringView(textImpl->characters16(), textImpl->length()));
</del><ins>+ UBreakIterator* iterator = cursorMovementIterator(StringView(textImpl->characters16(), textImpl->length()));
</ins><span class="cx"> if (!iterator)
</span><span class="cx"> return current - 1;
</span><span class="cx">
</span><del>- long result = textBreakPreceding(iterator, current);
- if (result == TextBreakDone)
</del><ins>+ long result = ubrk_preceding(iterator, current);
+ if (result == UBRK_DONE)
</ins><span class="cx"> result = current - 1;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1523,7 +1523,7 @@
</span><span class="cx"> ASSERT(!m_text.isNull());
</span><span class="cx"> StringImpl& text = *m_text.impl();
</span><span class="cx">
</span><del>- // FIXME: Unclear why this has so much handrolled code rather than using TextBreakIterator.
</del><ins>+ // FIXME: Unclear why this has so much handrolled code rather than using UBreakIterator.
</ins><span class="cx"> // Also unclear why this is so different from advanceByCombiningCharacterSequence.
</span><span class="cx">
</span><span class="cx"> // FIXME: Seems like this fancier case could be used on all platforms now, no
</span><span class="lines">@@ -1649,12 +1649,12 @@
</span><span class="cx"> return current + 1;
</span><span class="cx">
</span><span class="cx"> StringImpl* textImpl = m_text.impl();
</span><del>- TextBreakIterator* iterator = cursorMovementIterator(StringView(textImpl->characters16(), textImpl->length()));
</del><ins>+ UBreakIterator* iterator = cursorMovementIterator(StringView(textImpl->characters16(), textImpl->length()));
</ins><span class="cx"> if (!iterator)
</span><span class="cx"> return current + 1;
</span><span class="cx">
</span><del>- long result = textBreakFollowing(iterator, current);
- if (result == TextBreakDone)
</del><ins>+ long result = ubrk_following(iterator, current);
+ if (result == UBRK_DONE)
</ins><span class="cx"> result = current + 1;
</span><span class="cx">
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "BreakLines.h"
</span><span class="cx"> #include "RenderLineBreak.h"
</span><span class="cx"> #include "SimpleLineLayoutFlowContents.h"
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineBreakerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineBreaker.h (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineBreaker.h 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebCore/rendering/line/LineBreaker.h 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "LineInfo.h"
</span><span class="cx"> #include "LineInlineHeaders.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/text/TextBreakIterator.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebKit/ios/ChangeLog 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-12-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Stop reinterpret_casting UBreakIterators to the undefined type TextBreakIterator
+ https://bugs.webkit.org/show_bug.cgi?id=165931
+
+ Reviewed by Alex Christensen.
+
+ * Misc/WebUIKitSupport.mm:
+
</ins><span class="cx"> 2016-11-01 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr from DumpRenderTree
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebUIKitSupportmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #import <WebCore/WebCoreSystemInterface.h>
</span><span class="cx"> #import <WebCore/WebCoreThreadSystemInterface.h>
</span><span class="cx"> #import <wtf/spi/darwin/dyldSPI.h>
</span><del>-#import <wtf/text/TextBreakIterator.h>
</del><span class="cx">
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflTextCheckerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> static unsigned nextWordOffset(StringView text, unsigned currentOffset)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: avoid creating textIterator object here, it could be passed as a parameter.
</span><del>- // isTextBreak() leaves the iterator pointing to the first boundary position at
</del><ins>+ // ubrk_isBoundary() leaves the iterator pointing to the first boundary position at
</ins><span class="cx"> // or after "offset" (ubrk_isBoundary side effect).
</span><span class="cx"> // For many word separators, the method doesn't properly determine the boundaries
</span><span class="cx"> // without resetting the iterator.
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> return currentOffset;
</span><span class="cx">
</span><span class="cx"> unsigned wordOffset = currentOffset;
</span><del>- while (wordOffset < text.length() && isTextBreak(textIterator, wordOffset))
</del><ins>+ while (wordOffset < text.length() && ubrk_isBoundary(textIterator, wordOffset))
</ins><span class="cx"> ++wordOffset;
</span><span class="cx">
</span><span class="cx"> // Do not treat the word's boundary as a separator.
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> // involve the client to check spelling for them.
</span><span class="cx"> unsigned offset = nextWordOffset(text, 0);
</span><span class="cx"> unsigned lengthStrip = text.length();
</span><del>- while (lengthStrip > 0 && isTextBreak(textIterator, lengthStrip - 1))
</del><ins>+ while (lengthStrip > 0 && ubrk_isBoundary(textIterator, lengthStrip - 1))
</ins><span class="cx"> --lengthStrip;
</span><span class="cx">
</span><span class="cx"> while (offset < lengthStrip) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkTextCheckerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp (209906 => 209907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2016-12-16 04:52:20 UTC (rev 209906)
+++ trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2016-12-16 05:19:32 UTC (rev 209907)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/TextCheckerEnchant.h>
</span><ins>+#include <unicode/ubrk.h>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/TextBreakIterator.h>
</span><span class="cx">
</span><span class="lines">@@ -226,16 +227,16 @@
</span><span class="cx"> static unsigned nextWordOffset(StringView text, unsigned currentOffset)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: avoid creating textIterator object here, it could be passed as a parameter.
</span><del>- // isTextBreak() leaves the iterator pointing to the first boundary position at
</del><ins>+ // ubrk_isBoundary() leaves the iterator pointing to the first boundary position at
</ins><span class="cx"> // or after "offset" (ubrk_isBoundary side effect).
</span><span class="cx"> // For many word separators, the method doesn't properly determine the boundaries
</span><span class="cx"> // without resetting the iterator.
</span><del>- TextBreakIterator* textIterator = wordBreakIterator(text);
</del><ins>+ UBreakIterator* textIterator = wordBreakIterator(text);
</ins><span class="cx"> if (!textIterator)
</span><span class="cx"> return currentOffset;
</span><span class="cx">
</span><span class="cx"> unsigned wordOffset = currentOffset;
</span><del>- while (wordOffset < text.length() && isTextBreak(textIterator, wordOffset))
</del><ins>+ while (wordOffset < text.length() && ubrk_isBoundary(textIterator, wordOffset))
</ins><span class="cx"> ++wordOffset;
</span><span class="cx">
</span><span class="cx"> // Do not treat the word's boundary as a separator.
</span><span class="lines">@@ -258,7 +259,7 @@
</span><span class="cx"> if (!(checkingTypes & TextCheckingTypeSpelling))
</span><span class="cx"> return Vector<TextCheckingResult>();
</span><span class="cx">
</span><del>- TextBreakIterator* textIterator = wordBreakIterator(text);
</del><ins>+ UBreakIterator* textIterator = wordBreakIterator(text);
</ins><span class="cx"> if (!textIterator)
</span><span class="cx"> return Vector<TextCheckingResult>();
</span><span class="cx">
</span><span class="lines">@@ -266,7 +267,7 @@
</span><span class="cx"> // involve the client to check spelling for them.
</span><span class="cx"> unsigned offset = nextWordOffset(text, 0);
</span><span class="cx"> unsigned lengthStrip = text.length();
</span><del>- while (lengthStrip > 0 && isTextBreak(textIterator, lengthStrip - 1))
</del><ins>+ while (lengthStrip > 0 && ubrk_isBoundary(textIterator, lengthStrip - 1))
</ins><span class="cx"> --lengthStrip;
</span><span class="cx">
</span><span class="cx"> Vector<TextCheckingResult> paragraphCheckingResult;
</span></span></pre>
</div>
</div>
</body>
</html>