<!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>[210078] 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/210078">210078</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-21 14:11:39 -0800 (Wed, 21 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize findPlainText
https://bugs.webkit.org/show_bug.cgi?id=166299
Reviewed by Sam Weinig.
Modernized findPlainText by merging the static version of it into it
and extracting the main nested loop out as findPlainTextOffset.
No new tests since there should be no behavioral change.
* editing/TextIterator.cpp:
(WebCore::findPlainTextOffset):
(WebCore::findPlainText):</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 (210077 => 210078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-21 22:06:22 UTC (rev 210077)
+++ trunk/Source/WebCore/ChangeLog 2016-12-21 22:11:39 UTC (rev 210078)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-21 Ryosuke Niwa <rniwa@webkit.org>
+
+ Modernize findPlainText
+ https://bugs.webkit.org/show_bug.cgi?id=166299
+
+ Reviewed by Sam Weinig.
+
+ Modernized findPlainText by merging the static version of it into it
+ and extracting the main nested loop out as findPlainTextOffset.
+
+ No new tests since there should be no behavioral change.
+
+ * editing/TextIterator.cpp:
+ (WebCore::findPlainTextOffset):
+ (WebCore::findPlainText):
+
</ins><span class="cx"> 2016-12-21 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Switch to a blacklist model for restricted Accept headers in simple CORS requests
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (210077 => 210078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2016-12-21 22:06:22 UTC (rev 210077)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2016-12-21 22:11:39 UTC (rev 210078)
</span><span class="lines">@@ -2608,11 +2608,39 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static size_t findPlainText(const Range& range, const String& target, FindOptions options, size_t& matchStart)
</del><ins>+static std::optional<std::pair<size_t, size_t>> findPlainTextOffset(SearchBuffer& buffer, CharacterIterator& findIterator, bool searchForward)
</ins><span class="cx"> {
</span><del>- matchStart = 0;
</del><ins>+ size_t matchStart = 0;
</ins><span class="cx"> size_t matchLength = 0;
</span><ins>+ while (!findIterator.atEnd()) {
+ findIterator.advance(buffer.append(findIterator.text()));
+ while (1) {
+ size_t matchStartOffset;
+ size_t newMatchLength = buffer.search(matchStartOffset);
+ if (!newMatchLength) {
+ if (findIterator.atBreak() && !buffer.atBreak()) {
+ buffer.reachedBreak();
+ continue;
+ }
+ break;
+ }
+ size_t lastCharacterInBufferOffset = findIterator.characterOffset();
+ ASSERT(lastCharacterInBufferOffset >= matchStartOffset);
+ matchStart = lastCharacterInBufferOffset - matchStartOffset;
+ matchLength = newMatchLength;
+ if (searchForward) // Look for the last match when searching backwards instead.
+ return std::pair<size_t, size_t> { matchStart, matchLength };
+ }
+ }
</ins><span class="cx">
</span><ins>+ if (!matchLength)
+ return std::nullopt;
+
+ return std::pair<size_t, size_t> { matchStart, matchLength };
+}
+
+Ref<Range> findPlainText(const Range& range, const String& target, FindOptions options)
+{
</ins><span class="cx"> SearchBuffer buffer(target, options);
</span><span class="cx">
</span><span class="cx"> if (buffer.needsMoreContext()) {
</span><span class="lines">@@ -2625,47 +2653,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CharacterIterator findIterator(range, TextIteratorEntersTextControls | TextIteratorClipsToFrameAncestors);
</del><ins>+ bool searchForward = !(options & Backwards);
+ TextIteratorBehavior iteratorOptions = TextIteratorEntersTextControls | TextIteratorClipsToFrameAncestors;
</ins><span class="cx">
</span><del>- while (!findIterator.atEnd()) {
- findIterator.advance(buffer.append(findIterator.text()));
-tryAgain:
- size_t matchStartOffset;
- if (size_t newMatchLength = buffer.search(matchStartOffset)) {
- // Note that we found a match, and where we found it.
- size_t lastCharacterInBufferOffset = findIterator.characterOffset();
- ASSERT(lastCharacterInBufferOffset >= matchStartOffset);
- matchStart = lastCharacterInBufferOffset - matchStartOffset;
- matchLength = newMatchLength;
- // If searching forward, stop on the first match.
- // If searching backward, don't stop, so we end up with the last match.
- if (!(options & Backwards))
- break;
- goto tryAgain;
- }
- if (findIterator.atBreak() && !buffer.atBreak()) {
- buffer.reachedBreak();
- goto tryAgain;
- }
- }
</del><ins>+ CharacterIterator findIterator(range, iteratorOptions);
+ auto result = findPlainTextOffset(buffer, findIterator, searchForward);
+ if (!result)
+ return collapsedToBoundary(range, searchForward);
</ins><span class="cx">
</span><del>- return matchLength;
</del><ins>+ CharacterIterator rangeComputeIterator(range, iteratorOptions);
+ return characterSubrange(range.ownerDocument(), rangeComputeIterator, result->first, result->second);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Range> findPlainText(const Range& range, const String& target, FindOptions options)
-{
- // First, find the text.
- size_t matchStart;
- size_t matchLength;
- {
- matchLength = findPlainText(range, target, options, matchStart);
- if (!matchLength)
- return collapsedToBoundary(range, !(options & Backwards));
- }
-
- // Then, find the document position of the start and the end of the text.
- CharacterIterator computeRangeIterator(range, TextIteratorEntersTextControls | TextIteratorClipsToFrameAncestors);
- return characterSubrange(range.ownerDocument(), computeRangeIterator, matchStart, matchLength);
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre>
</div>
</div>
</body>
</html>