<!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>[162184] 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/162184">162184</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-01-16 22:22:46 -0800 (Thu, 16 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TextBreakIterator's should support Latin-1 for all iterator types (Part 3)
https://bugs.webkit.org/show_bug.cgi?id=126856
Reviewed by Ryosuke Niwa.
Change all the TextBreakIterator creation functions to take StringViews. Remove a few
now unnecessary up-conversions to UTF-16 in the process.
../WebCore:
* dom/CharacterData.cpp:
* editing/TextCheckingHelper.cpp:
* editing/VisibleUnits.cpp:
* platform/graphics/StringTruncator.cpp:
* platform/graphics/mac/ComplexTextController.cpp:
* platform/text/TextBoundaries.cpp:
* platform/text/TextBreakIterator.cpp:
* platform/text/TextBreakIterator.h:
* rendering/RenderText.cpp:
../WebKit/ios:
* Misc/WebNSStringDrawing.mm:
../WebKit2:
* UIProcess/efl/TextCheckerEfl.cpp:
(WebKit::nextWordOffset):
(WebKit::TextChecker::checkTextOfParagraph):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#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="#trunkSourceWebCoreplatformtextTextBreakIteratorcpp">trunk/Source/WebCore/platform/text/TextBreakIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextBreakIteratorh">trunk/Source/WebCore/platform/text/TextBreakIterator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextenchantTextCheckerEnchantcpp">trunk/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebNSStringDrawingmm">trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflTextCheckerEflcpp">trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/ChangeLog 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-15 Sam Weinig <sam@webkit.org>
+
+ TextBreakIterator's should support Latin-1 for all iterator types (Part 3)
+ https://bugs.webkit.org/show_bug.cgi?id=126856
+
+ Reviewed by Ryosuke Niwa.
+
+ Change all the TextBreakIterator creation functions to take StringViews. Remove a few
+ now unnecessary up-conversions to UTF-16 in the process.
+
+ * dom/CharacterData.cpp:
+ * editing/TextCheckingHelper.cpp:
+ * editing/VisibleUnits.cpp:
+ * platform/graphics/StringTruncator.cpp:
+ * platform/graphics/mac/ComplexTextController.cpp:
+ * platform/text/TextBoundaries.cpp:
+ * platform/text/TextBreakIterator.cpp:
+ * platform/text/TextBreakIterator.h:
+ * rendering/RenderText.cpp:
+
</ins><span class="cx"> 2014-01-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Run clang-modernize and let it add a bunch of missing overrides.
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.cpp (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.cpp 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/dom/CharacterData.cpp 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> // see <https://bugs.webkit.org/show_bug.cgi?id=29092>.
</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><del>- NonSharedCharacterBreakIterator it(string.deprecatedCharacters() + offset, (characterLengthLimit + 2 > characterLength) ? characterLength : characterLengthLimit + 2);
</del><ins>+ NonSharedCharacterBreakIterator it(StringView(string).substring(offset, (characterLengthLimit + 2 > characterLength) ? characterLength : characterLengthLimit + 2));
</ins><span class="cx"> if (!isTextBreak(it, characterLengthLimit))
</span><span class="cx"> characterLengthLimit = textBreakPreceding(it, characterLengthLimit);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextCheckingHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextCheckingHelper.cpp (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -70,9 +70,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static void findMisspellings(TextCheckerClient* client, const UChar* text, int start, int length, Vector<TextCheckingResult>& results)
</del><ins>+static void findMisspellings(TextCheckerClient* client, const UChar* text, int length, Vector<TextCheckingResult>& results)
</ins><span class="cx"> {
</span><del>- TextBreakIterator* iterator = wordBreakIterator(text + start, length);
</del><ins>+ TextBreakIterator* iterator = wordBreakIterator(StringView(text, length));
</ins><span class="cx"> if (!iterator)
</span><span class="cx"> return;
</span><span class="cx"> int wordStart = textBreakCurrent(iterator);
</span><span class="lines">@@ -83,13 +83,13 @@
</span><span class="cx"> int wordLength = wordEnd - wordStart;
</span><span class="cx"> int misspellingLocation = -1;
</span><span class="cx"> int misspellingLength = 0;
</span><del>- client->checkSpellingOfString(text + start + wordStart, wordLength, &misspellingLocation, &misspellingLength);
</del><ins>+ client->checkSpellingOfString(text + wordStart, wordLength, &misspellingLocation, &misspellingLength);
</ins><span class="cx"> if (0 < misspellingLength) {
</span><span class="cx"> ASSERT(0 <= misspellingLocation && misspellingLocation <= wordLength);
</span><span class="cx"> ASSERT(0 < misspellingLength && misspellingLocation + misspellingLength <= wordLength);
</span><span class="cx"> TextCheckingResult misspelling;
</span><span class="cx"> misspelling.type = TextCheckingTypeSpelling;
</span><del>- misspelling.location = start + wordStart + misspellingLocation;
</del><ins>+ misspelling.location = wordStart + misspellingLocation;
</ins><span class="cx"> misspelling.length = misspellingLength;
</span><span class="cx"> misspelling.replacement = client->getAutoCorrectSuggestionForMisspelledWord(String(text + misspelling.location, misspelling.length));
</span><span class="cx"> results.append(misspelling);
</span><span class="lines">@@ -648,7 +648,7 @@
</span><span class="cx"> #else
</span><span class="cx"> Vector<TextCheckingResult> spellingResult;
</span><span class="cx"> if (checkingTypes & TextCheckingTypeSpelling)
</span><del>- findMisspellings(client, text, 0, length, spellingResult);
</del><ins>+ findMisspellings(client, text, length, spellingResult);
</ins><span class="cx">
</span><span class="cx"> #if USE(GRAMMAR_CHECKING)
</span><span class="cx"> Vector<TextCheckingResult> grammarResult;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -301,8 +301,8 @@
</span><span class="cx"> string.append(textBox->renderer().text()->deprecatedCharacters() + textBox->start(), textBox->len());
</span><span class="cx"> len += textBox->len();
</span><span class="cx">
</span><del>- return wordBreakIterator(string.data(), len);
-}
</del><ins>+ return wordBreakIterator(StringView(string.data(), len));
+}
</ins><span class="cx">
</span><span class="cx"> static TextBreakIterator* wordBreakIteratorForMaxOffsetBoundary(const VisiblePosition& visiblePosition, const InlineTextBox* textBox,
</span><span class="cx"> bool& nextBoxInDifferentBlock, Vector<UChar, 1024>& string, CachedLogicallyOrderedLeafBoxes& leafBoxes)
</span><span class="lines">@@ -322,8 +322,8 @@
</span><span class="cx"> len += nextTextBox->len();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return wordBreakIterator(string.data(), len);
-}
</del><ins>+ return wordBreakIterator(StringView(string.data(), len));
+}
</ins><span class="cx">
</span><span class="cx"> static bool isLogicalStartOfWord(TextBreakIterator* iter, int position, bool hardLineBreak)
</span><span class="cx"> {
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> else if (offsetInBox == box->caretMaxOffset())
</span><span class="cx"> iter = wordBreakIteratorForMaxOffsetBoundary(visiblePosition, textBox, nextBoxInDifferentBlock, string, leafBoxes);
</span><span class="cx"> else if (movingIntoNewBox) {
</span><del>- iter = wordBreakIterator(textBox->renderer().text()->deprecatedCharacters() + textBox->start(), textBox->len());
</del><ins>+ iter = wordBreakIterator(StringView(textBox->renderer().text()).substring(textBox->start(), textBox->len()));
</ins><span class="cx"> previouslyVisitedBox = box;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1046,7 +1046,7 @@
</span><span class="cx">
</span><span class="cx"> static unsigned startSentenceBoundary(const UChar* characters, unsigned length, unsigned, BoundarySearchContextAvailability, bool&)
</span><span class="cx"> {
</span><del>- TextBreakIterator* iterator = sentenceBreakIterator(characters, length);
</del><ins>+ TextBreakIterator* iterator = sentenceBreakIterator(StringView(characters, length));
</ins><span class="cx"> // FIXME: The following function can return -1; we don't handle that.
</span><span class="cx"> return textBreakPreceding(iterator, length);
</span><span class="cx"> }
</span><span class="lines">@@ -1058,7 +1058,7 @@
</span><span class="cx">
</span><span class="cx"> static unsigned endSentenceBoundary(const UChar* characters, unsigned length, unsigned, BoundarySearchContextAvailability, bool&)
</span><span class="cx"> {
</span><del>- TextBreakIterator* iterator = sentenceBreakIterator(characters, length);
</del><ins>+ TextBreakIterator* iterator = sentenceBreakIterator(StringView(characters, length));
</ins><span class="cx"> return textBreakNext(iterator);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1071,7 +1071,7 @@
</span><span class="cx"> static unsigned previousSentencePositionBoundary(const UChar* characters, unsigned length, unsigned, BoundarySearchContextAvailability, bool&)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This is identical to startSentenceBoundary. I'm pretty sure that's not right.
</span><del>- TextBreakIterator* iterator = sentenceBreakIterator(characters, length);
</del><ins>+ TextBreakIterator* iterator = sentenceBreakIterator(StringView(characters, length));
</ins><span class="cx"> // FIXME: The following function can return -1; we don't handle that.
</span><span class="cx"> return textBreakPreceding(iterator, length);
</span><span class="cx"> }
</span><span class="lines">@@ -1086,7 +1086,7 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This is identical to endSentenceBoundary. This isn't right, it needs to
</span><span class="cx"> // move to the equivlant position in the following sentence.
</span><del>- TextBreakIterator* iterator = sentenceBreakIterator(characters, length);
</del><ins>+ TextBreakIterator* iterator = sentenceBreakIterator(StringView(characters, length));
</ins><span class="cx"> return textBreakFollowing(iterator, 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsStringTruncatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/StringTruncator.cpp (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/StringTruncator.cpp 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/platform/graphics/StringTruncator.cpp 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(keepCount < STRING_BUFFER_SIZE);
</span><span class="cx">
</span><span class="cx"> unsigned omitStart = (keepCount + 1) / 2;
</span><del>- NonSharedCharacterBreakIterator it(string.deprecatedCharacters(), length);
</del><ins>+ NonSharedCharacterBreakIterator it(StringView(string).substring(0, length));
</ins><span class="cx"> unsigned omitEnd = boundedTextBreakFollowing(it, omitStart + (length - keepCount) - 1, length);
</span><span class="cx"> omitStart = textBreakAtOrPreceding(it, omitStart);
</span><span class="cx">
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> --keepCount;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- NonSharedCharacterBreakIterator it(string.deprecatedCharacters(), length);
</del><ins>+ NonSharedCharacterBreakIterator it(StringView(string).substring(0, length));
</ins><span class="cx"> unsigned keepLength = textBreakAtOrPreceding(it, keepCount);
</span><span class="cx"> unsigned truncatedLength = shouldInsertEllipsis ? keepLength + 1 : keepLength;
</span><span class="cx">
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> ASSERT(keepCount < length);
</span><span class="cx"> ASSERT(keepCount < STRING_BUFFER_SIZE);
</span><span class="cx">
</span><del>- NonSharedCharacterBreakIterator it(string.deprecatedCharacters(), length);
</del><ins>+ NonSharedCharacterBreakIterator it(StringView(string).substring(0, length));
</ins><span class="cx"> unsigned keepLength = textBreakAtOrPreceding(it, keepCount);
</span><span class="cx"> memcpy(buffer, string.deprecatedCharacters(), sizeof(UChar) * keepLength);
</span><span class="cx">
</span><span class="lines">@@ -143,7 +143,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(string.deprecatedCharacters(), length);
</del><ins>+ TextBreakIterator* it = wordBreakIterator(StringView(string).substring(0, length));
</ins><span class="cx"> unsigned keepLength = textBreakAtOrPreceding(it, keepCount);
</span><span class="cx"> memcpy(buffer, string.deprecatedCharacters(), sizeof(UChar) * keepLength);
</span><span class="cx">
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned startIndex = length - keepCount;
</span><span class="cx">
</span><del>- NonSharedCharacterBreakIterator it(string.deprecatedCharacters(), length);
</del><ins>+ NonSharedCharacterBreakIterator it(string);
</ins><span class="cx"> unsigned adjustedStartIndex = startIndex;
</span><span class="cx"> startIndex = boundedTextBreakFollowing(it, startIndex, length - startIndex);
</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 (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> // ligature carets.
</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(complexTextRun.characters(), stringLength);
</del><ins>+ TextBreakIterator* cursorPositionIterator = cursorMovementIterator(StringView(complexTextRun.characters(), stringLength));
</ins><span class="cx"> int clusterStart;
</span><span class="cx"> if (isTextBreak(cursorPositionIterator, hitIndex))
</span><span class="cx"> clusterStart = hitIndex;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBoundariescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBoundaries.cpp (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBoundaries.cpp 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/platform/text/TextBoundaries.cpp 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> int findNextWordFromIndex(const UChar* chars, int len, int position, bool forward)
</span><span class="cx"> {
</span><del>- TextBreakIterator* it = wordBreakIterator(chars, len);
</del><ins>+ TextBreakIterator* it = wordBreakIterator(StringView(chars, len));
</ins><span class="cx">
</span><span class="cx"> if (forward) {
</span><span class="cx"> position = textBreakFollowing(it, position);
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void findWordBoundary(const UChar* chars, int len, int position, int* start, int* end)
</span><span class="cx"> {
</span><del>- TextBreakIterator* it = wordBreakIterator(chars, len);
</del><ins>+ TextBreakIterator* it = wordBreakIterator(StringView(chars, len));
</ins><span class="cx"> *end = textBreakFollowing(it, position);
</span><span class="cx"> if (*end < 0)
</span><span class="cx"> *end = textBreakLast(it);
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> void findEndWordBoundary(const UChar* chars, int len, int position, int* end)
</span><span class="cx"> {
</span><del>- TextBreakIterator* it = wordBreakIterator(chars, len);
</del><ins>+ TextBreakIterator* it = wordBreakIterator(StringView(chars, len));
</ins><span class="cx"> *end = textBreakFollowing(it, position);
</span><span class="cx"> if (*end < 0)
</span><span class="cx"> *end = textBreakLast(it);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBreakIterator.cpp (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBreakIterator.cpp 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/platform/text/TextBreakIterator.cpp 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -138,25 +138,25 @@
</span><span class="cx">
</span><span class="cx"> // Static iterators
</span><span class="cx">
</span><del>-TextBreakIterator* wordBreakIterator(const UChar* buffer, int length)
</del><ins>+TextBreakIterator* wordBreakIterator(StringView string)
</ins><span class="cx"> {
</span><span class="cx"> static TextBreakIterator* staticWordBreakIterator = initializeIterator(UBRK_WORD);
</span><span class="cx"> if (!staticWordBreakIterator)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return setTextForIterator(*staticWordBreakIterator, StringView(buffer, length));
</del><ins>+ return setTextForIterator(*staticWordBreakIterator, string);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-TextBreakIterator* sentenceBreakIterator(const UChar* buffer, int length)
</del><ins>+TextBreakIterator* sentenceBreakIterator(StringView string)
</ins><span class="cx"> {
</span><span class="cx"> static TextBreakIterator* staticSentenceBreakIterator = initializeIterator(UBRK_SENTENCE);
</span><span class="cx"> if (!staticSentenceBreakIterator)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return setTextForIterator(*staticSentenceBreakIterator, StringView(buffer, length));
</del><ins>+ return setTextForIterator(*staticSentenceBreakIterator, string);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-TextBreakIterator* cursorMovementIterator(const UChar* buffer, int length)
</del><ins>+TextBreakIterator* 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 4.0
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> if (!staticCursorMovementIterator)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return setTextForIterator(*staticCursorMovementIterator, StringView(buffer, length));
</del><ins>+ return setTextForIterator(*staticCursorMovementIterator, string);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextBreakIterator* acquireLineBreakIterator(StringView string, const AtomicString& locale, const UChar* priorContext, unsigned priorContextLength)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator(const UChar* buffer, int length)
</del><ins>+NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator(StringView string)
</ins><span class="cx"> {
</span><span class="cx"> m_iterator = nonSharedCharacterBreakIterator;
</span><span class="cx">
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> if (!m_iterator)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_iterator = setTextForIterator(*m_iterator, StringView(buffer, length));
</del><ins>+ m_iterator = setTextForIterator(*m_iterator, string);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NonSharedCharacterBreakIterator::~NonSharedCharacterBreakIterator()
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx"> if (s.is8Bit() && !s.contains('\r'))
</span><span class="cx"> return stringLength;
</span><span class="cx">
</span><del>- NonSharedCharacterBreakIterator it(s.deprecatedCharacters(), stringLength);
</del><ins>+ NonSharedCharacterBreakIterator it(s);
</ins><span class="cx"> if (!it)
</span><span class="cx"> return stringLength;
</span><span class="cx">
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> if (s.is8Bit() && !s.contains('\r'))
</span><span class="cx"> return std::min(stringLength, numGraphemeClusters);
</span><span class="cx">
</span><del>- NonSharedCharacterBreakIterator it(s.deprecatedCharacters(), stringLength);
</del><ins>+ NonSharedCharacterBreakIterator it(s);
</ins><span class="cx"> if (!it)
</span><span class="cx"> return std::min(stringLength, numGraphemeClusters);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBreakIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBreakIterator.h (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBreakIterator.h 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/platform/text/TextBreakIterator.h 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -36,10 +36,10 @@
</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>-TextBreakIterator* cursorMovementIterator(const UChar*, int length);
</del><ins>+TextBreakIterator* cursorMovementIterator(StringView);
</ins><span class="cx">
</span><del>-TextBreakIterator* wordBreakIterator(const UChar*, int length);
-TextBreakIterator* sentenceBreakIterator(const UChar*, int length);
</del><ins>+TextBreakIterator* wordBreakIterator(StringView);
+TextBreakIterator* sentenceBreakIterator(StringView);
</ins><span class="cx">
</span><span class="cx"> TextBreakIterator* acquireLineBreakIterator(StringView, const AtomicString& locale, const UChar* priorContext, unsigned priorContextLength);
</span><span class="cx"> void releaseLineBreakIterator(TextBreakIterator*);
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> class NonSharedCharacterBreakIterator {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NonSharedCharacterBreakIterator);
</span><span class="cx"> public:
</span><del>- NonSharedCharacterBreakIterator(const UChar*, int length);
</del><ins>+ NonSharedCharacterBreakIterator(StringView);
</ins><span class="cx"> ~NonSharedCharacterBreakIterator();
</span><span class="cx">
</span><span class="cx"> operator TextBreakIterator*() const { return m_iterator; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextenchantTextCheckerEnchantcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> if (!hasDictionary())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- TextBreakIterator* iter = wordBreakIterator(string.characters(), string.length());
</del><ins>+ TextBreakIterator* iter = wordBreakIterator(string);
</ins><span class="cx"> if (!iter)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> stringWithPrevious[i] = stringImpl[i - 1];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- TextBreakIterator* boundary = wordBreakIterator(stringWithPrevious.characters(), length + 1);
</del><ins>+ TextBreakIterator* 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">@@ -1340,7 +1340,7 @@
</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(textImpl->characters16(), textImpl->length());
</del><ins>+ TextBreakIterator* 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><span class="lines">@@ -1493,7 +1493,7 @@
</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(textImpl->characters16(), textImpl->length());
</del><ins>+ TextBreakIterator* 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></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-15 Sam Weinig <sam@webkit.org>
+
+ TextBreakIterator's should support Latin-1 for all iterator types (Part 3)
+ https://bugs.webkit.org/show_bug.cgi?id=126856
+
+ Reviewed by Ryosuke Niwa.
+
+ Change all the TextBreakIterator creation functions to take StringViews. Remove a few
+ now unnecessary up-conversions to UTF-16 in the process.
+
+ * Misc/WebNSStringDrawing.mm:
+
</ins><span class="cx"> 2014-01-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Change all uses of FINAL to final now that all our compilers support it
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebNSStringDrawingmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx"> if (ellipsisStyle == WebEllipsisStyleCharacterWrap) {
</span><span class="cx"> // We can break on characters. We should do something smarter, like split the length of the entire line
</span><span class="cx"> // Don't, however, break in the middle of a character.
</span><del>- NonSharedCharacterBreakIterator it(pos, lengthRemaining);
</del><ins>+ NonSharedCharacterBreakIterator it(StringView(pos, lengthRemaining));
</ins><span class="cx"> breakPos = boundedTextBreakFollowing(it, 0, lengthRemaining);
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx"> // This must be a long word that doesn't fit inside the entire width
</span><span class="cx"> // Fit it on a line one character at a time and break when no more characters fit
</span><span class="cx"> // Force at least one character to avoid the edge case where a single glyph doesn't fit within width
</span><del>- NonSharedCharacterBreakIterator it(pos, lengthRemaining);
</del><ins>+ NonSharedCharacterBreakIterator it(StringView(pos, lengthRemaining));
</ins><span class="cx"> int offset = 0;
</span><span class="cx"> int nextCharBreak = boundedTextBreakFollowing(it, offset, lengthRemaining);
</span><span class="cx"> TextRun textRun(pos, nextCharBreak);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-15 Sam Weinig <sam@webkit.org>
+
+ TextBreakIterator's should support Latin-1 for all iterator types (Part 3)
+ https://bugs.webkit.org/show_bug.cgi?id=126856
+
+ Reviewed by Ryosuke Niwa.
+
+ Change all the TextBreakIterator creation functions to take StringViews. Remove a few
+ now unnecessary up-conversions to UTF-16 in the process.
+
+ * UIProcess/efl/TextCheckerEfl.cpp:
+ (WebKit::nextWordOffset):
+ (WebKit::TextChecker::checkTextOfParagraph):
+
</ins><span class="cx"> 2014-01-16 Eunmi Lee <eunmi15.lee@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] EwkView can not be shown without re-sizing once it is hidden.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflTextCheckerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp (162183 => 162184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp 2014-01-17 06:06:36 UTC (rev 162183)
+++ trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp 2014-01-17 06:22:46 UTC (rev 162184)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><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, length);
</del><ins>+ TextBreakIterator* textIterator = wordBreakIterator(StringView(text, length));
</ins><span class="cx"> if (!textIterator)
</span><span class="cx"> return currentOffset;
</span><span class="cx">
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> Vector<TextCheckingResult> paragraphCheckingResult;
</span><span class="cx"> #if ENABLE(SPELLCHECK)
</span><span class="cx"> if (checkingTypes & TextCheckingTypeSpelling) {
</span><del>- TextBreakIterator* textIterator = wordBreakIterator(text, length);
</del><ins>+ TextBreakIterator* textIterator = wordBreakIterator(StringView(text, length));
</ins><span class="cx"> if (!textIterator)
</span><span class="cx"> return paragraphCheckingResult;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>