<!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>[166507] 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/166507">166507</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 09:32:25 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove special handling of soft hyphens in search code
https://bugs.webkit.org/show_bug.cgi?id=130940
Reviewed by Anders Carlsson.
ICU knows to ignore soft hyphens, so we don't need to replace them before searching.
Covered by existing tests.
* editing/TextIterator.cpp:
(WebCore::foldQuoteMark):
(WebCore::foldQuoteMarks):
(WebCore::SearchBuffer::SearchBuffer):
(WebCore::SearchBuffer::append):
(WebCore::foldQuoteMarkOrSoftHyphen): Deleted.
(WebCore::foldQuoteMarksAndSoftHyphens): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166506 => 166507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-31 16:30:00 UTC (rev 166506)
+++ trunk/Source/WebCore/ChangeLog 2014-03-31 16:32:25 UTC (rev 166507)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-03-31 Alexey Proskuryakov <ap@apple.com>
+
+ Remove special handling of soft hyphens in search code
+ https://bugs.webkit.org/show_bug.cgi?id=130940
+
+ Reviewed by Anders Carlsson.
+
+ ICU knows to ignore soft hyphens, so we don't need to replace them before searching.
+
+ Covered by existing tests.
+
+ * editing/TextIterator.cpp:
+ (WebCore::foldQuoteMark):
+ (WebCore::foldQuoteMarks):
+ (WebCore::SearchBuffer::SearchBuffer):
+ (WebCore::SearchBuffer::append):
+ (WebCore::foldQuoteMarkOrSoftHyphen): Deleted.
+ (WebCore::foldQuoteMarksAndSoftHyphens): Deleted.
+
</ins><span class="cx"> 2014-03-31 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Preparation for using Soup on Windows.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (166506 => 166507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2014-03-31 16:30:00 UTC (rev 166506)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2014-03-31 16:32:25 UTC (rev 166507)
</span><span class="lines">@@ -1621,7 +1621,7 @@
</span><span class="cx">
</span><span class="cx"> // --------
</span><span class="cx">
</span><del>-static inline UChar foldQuoteMarkOrSoftHyphen(UChar c)
</del><ins>+static inline UChar foldQuoteMark(UChar c)
</ins><span class="cx"> {
</span><span class="cx"> switch (c) {
</span><span class="cx"> case hebrewPunctuationGershayim:
</span><span class="lines">@@ -1632,10 +1632,6 @@
</span><span class="cx"> case leftSingleQuotationMark:
</span><span class="cx"> case rightSingleQuotationMark:
</span><span class="cx"> return '\'';
</span><del>- case softHyphen:
- // Replace soft hyphen with an ignorable character so that their presence or absence will
- // not affect string comparison.
- return 0;
</del><span class="cx"> default:
</span><span class="cx"> return c;
</span><span class="cx"> }
</span><span class="lines">@@ -1644,7 +1640,7 @@
</span><span class="cx"> // FIXME: We'd like to tailor the searcher to fold quote marks for us instead
</span><span class="cx"> // of doing it in a separate replacement pass here, but ICU doesn't offer a way
</span><span class="cx"> // to add tailoring on top of the locale-specific tailoring as of this writing.
</span><del>-static inline String foldQuoteMarksAndSoftHyphens(String string)
</del><ins>+static inline String foldQuoteMarks(String string)
</ins><span class="cx"> {
</span><span class="cx"> string.replace(hebrewPunctuationGeresh, '\'');
</span><span class="cx"> string.replace(hebrewPunctuationGershayim, '"');
</span><span class="lines">@@ -1653,9 +1649,6 @@
</span><span class="cx"> string.replace(rightDoubleQuotationMark, '"');
</span><span class="cx"> string.replace(rightSingleQuotationMark, '\'');
</span><span class="cx">
</span><del>- // Replace soft hyphens with an ignorable character so that presence or absence will not affect string comparison.
- string.replace(softHyphen, 0);
-
</del><span class="cx"> return string;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1940,7 +1933,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline SearchBuffer::SearchBuffer(const String& target, FindOptions options)
</span><del>- : m_target(foldQuoteMarksAndSoftHyphens(target))
</del><ins>+ : m_target(foldQuoteMarks(target))
</ins><span class="cx"> , m_targetCharacters(StringView(m_target).upconvertedCharacters())
</span><span class="cx"> , m_options(options)
</span><span class="cx"> , m_prefixLength(0)
</span><span class="lines">@@ -2030,7 +2023,7 @@
</span><span class="cx"> ASSERT(usableLength);
</span><span class="cx"> m_buffer.grow(oldLength + usableLength);
</span><span class="cx"> for (unsigned i = 0; i < usableLength; ++i)
</span><del>- m_buffer[oldLength + i] = foldQuoteMarkOrSoftHyphen(text[i]);
</del><ins>+ m_buffer[oldLength + i] = foldQuoteMark(text[i]);
</ins><span class="cx"> return usableLength;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2267,7 +2260,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_target.isEmpty());
</span><span class="cx"> m_target.replace(noBreakSpace, ' ');
</span><del>- foldQuoteMarksAndSoftHyphens(m_target);
</del><ins>+ foldQuoteMarks(m_target);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline SearchBuffer::~SearchBuffer()
</span><span class="lines">@@ -2287,7 +2280,7 @@
</span><span class="cx">
</span><span class="cx"> inline void SearchBuffer::append(UChar c, bool isStart)
</span><span class="cx"> {
</span><del>- m_buffer[m_cursor] = c == noBreakSpace ? ' ' : foldQuoteMarkOrSoftHyphen(c);
</del><ins>+ m_buffer[m_cursor] = c == noBreakSpace ? ' ' : foldQuoteMark(c);
</ins><span class="cx"> m_isCharacterStartBuffer[m_cursor] = isStart;
</span><span class="cx"> if (++m_cursor == m_target.length()) {
</span><span class="cx"> m_cursor = 0;
</span></span></pre>
</div>
</div>
</body>
</html>