<!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>[169203] trunk/Source/WebCore</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/169203">169203</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-22 09:23:05 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/163712">r163712</a>): [GTK] Misspelling and grammar underline marks are no longer drawn
https://bugs.webkit.org/show_bug.cgi?id=133047
Reviewed by Darin Adler.
Change two conditions changed by mistake in <a href="http://trac.webkit.org/projects/webkit/changeset/163712">r163712</a>.
* editing/TextCheckingHelper.cpp:
(WebCore::findMisspellings): Enter the loop also when wordStart is 0.
(WebCore::TextCheckingHelper::findFirstMisspelling): Skip the work
when the text is a single character. Also reworked it to use a for
loop to improve the readability.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingTextCheckingHelpercpp">trunk/Source/WebCore/editing/TextCheckingHelper.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169202 => 169203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-22 15:51:47 UTC (rev 169202)
+++ trunk/Source/WebCore/ChangeLog 2014-05-22 16:23:05 UTC (rev 169203)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r163712): [GTK] Misspelling and grammar underline marks are no longer drawn
+ https://bugs.webkit.org/show_bug.cgi?id=133047
+
+ Reviewed by Darin Adler.
+
+ Change two conditions changed by mistake in r163712.
+
+ * editing/TextCheckingHelper.cpp:
+ (WebCore::findMisspellings): Enter the loop also when wordStart is 0.
+ (WebCore::TextCheckingHelper::findFirstMisspelling): Skip the work
+ when the text is a single character. Also reworked it to use a for
+ loop to improve the readability.
+
</ins><span class="cx"> 2014-05-22 Piotr Grad <p.grad@samsung.com>
</span><span class="cx">
</span><span class="cx"> Video is resumed with old playback rate.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextCheckingHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextCheckingHelper.cpp (169202 => 169203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2014-05-22 15:51:47 UTC (rev 169202)
+++ trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2014-05-22 16:23:05 UTC (rev 169203)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> TextBreakIterator* iterator = wordBreakIterator(text);
</span><span class="cx"> if (!iterator)
</span><span class="cx"> return;
</span><del>- for (int wordStart = textBreakCurrent(iterator); wordStart > 0; ) {
</del><ins>+ for (int wordStart = textBreakCurrent(iterator); wordStart >= 0; ) {
</ins><span class="cx"> int wordEnd = textBreakNext(iterator);
</span><span class="cx"> if (wordEnd < 0)
</span><span class="cx"> break;
</span><span class="lines">@@ -244,56 +244,53 @@
</span><span class="cx">
</span><span class="cx"> String TextCheckingHelper::findFirstMisspelling(int& firstMisspellingOffset, bool markAll, RefPtr<Range>& firstMisspellingRange)
</span><span class="cx"> {
</span><del>- WordAwareIterator it(*m_range);
</del><span class="cx"> firstMisspellingOffset = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> String firstMisspelling;
</span><span class="cx"> int currentChunkOffset = 0;
</span><span class="cx">
</span><del>- while (!it.atEnd()) {
</del><ins>+ for (WordAwareIterator it(*m_range); !it.atEnd(); currentChunkOffset += it.text().length(), it.advance()) {
</ins><span class="cx"> StringView text = it.text();
</span><span class="cx"> int textLength = text.length();
</span><span class="cx">
</span><del>- // Skip some work for one-space-char hunks
- if (textLength == 1 && text[0] == ' ') {
- int misspellingLocation = -1;
- int misspellingLength = 0;
- m_client->textChecker()->checkSpellingOfString(text, &misspellingLocation, &misspellingLength);
</del><ins>+ // Skip some work for one-space-char hunks.
+ if (textLength == 1 && text[0] == ' ')
+ continue;
</ins><span class="cx">
</span><del>- // 5490627 shows that there was some code path here where the String constructor below crashes.
- // We don't know exactly what combination of bad input caused this, so we're making this much
- // more robust against bad input on release builds.
- ASSERT(misspellingLength >= 0);
- ASSERT(misspellingLocation >= -1);
- ASSERT(!misspellingLength || misspellingLocation >= 0);
- ASSERT(misspellingLocation < textLength);
- ASSERT(misspellingLength <= textLength);
- ASSERT(misspellingLocation + misspellingLength <= textLength);
</del><ins>+ int misspellingLocation = -1;
+ int misspellingLength = 0;
+ m_client->textChecker()->checkSpellingOfString(text, &misspellingLocation, &misspellingLength);
</ins><span class="cx">
</span><del>- if (misspellingLocation >= 0 && misspellingLength > 0 && misspellingLocation < textLength && misspellingLength <= textLength && misspellingLocation + misspellingLength <= textLength) {
- // Compute range of misspelled word
- RefPtr<Range> misspellingRange = TextIterator::subrange(m_range.get(), currentChunkOffset + misspellingLocation, misspellingLength);
</del><ins>+ // 5490627 shows that there was some code path here where the String constructor below crashes.
+ // We don't know exactly what combination of bad input caused this, so we're making this much
+ // more robust against bad input on release builds.
+ ASSERT(misspellingLength >= 0);
+ ASSERT(misspellingLocation >= -1);
+ ASSERT(!misspellingLength || misspellingLocation >= 0);
+ ASSERT(misspellingLocation < textLength);
+ ASSERT(misspellingLength <= textLength);
+ ASSERT(misspellingLocation + misspellingLength <= textLength);
</ins><span class="cx">
</span><del>- // Remember first-encountered misspelling and its offset.
- if (!firstMisspelling) {
- firstMisspellingOffset = currentChunkOffset + misspellingLocation;
- firstMisspelling = text.substring(misspellingLocation, misspellingLength).toString();
- firstMisspellingRange = misspellingRange;
- }
</del><ins>+ if (misspellingLocation >= 0 && misspellingLength > 0 && misspellingLocation < textLength && misspellingLength <= textLength && misspellingLocation + misspellingLength <= textLength) {
+ // Compute range of misspelled word
+ RefPtr<Range> misspellingRange = TextIterator::subrange(m_range.get(), currentChunkOffset + misspellingLocation, misspellingLength);
</ins><span class="cx">
</span><del>- // Store marker for misspelled word.
- misspellingRange->startContainer()->document().markers().addMarker(misspellingRange.get(), DocumentMarker::Spelling);
-
- // Bail out if we're marking only the first misspelling, and not all instances.
- if (!markAll)
- break;
</del><ins>+ // Remember first-encountered misspelling and its offset.
+ if (!firstMisspelling) {
+ firstMisspellingOffset = currentChunkOffset + misspellingLocation;
+ firstMisspelling = text.substring(misspellingLocation, misspellingLength).toString();
+ firstMisspellingRange = misspellingRange;
</ins><span class="cx"> }
</span><ins>+
+ // Store marker for misspelled word.
+ misspellingRange->startContainer()->document().markers().addMarker(misspellingRange.get(), DocumentMarker::Spelling);
+
+ // Bail out if we're marking only the first misspelling, and not all instances.
+ if (!markAll)
+ break;
</ins><span class="cx"> }
</span><del>-
- currentChunkOffset += textLength;
- it.advance();
</del><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return firstMisspelling;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>