<!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>[177588] 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/177588">177588</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-12-19 11:48:06 -0800 (Fri, 19 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ref-ify TextIterator API.
<https://webkit.org/b/139823>
Reviewed by Antti Koivisto.
Source/WebCore:
Change TextIterator functions that always return Range objects to return
Ref<Range> instead of PassRefPtr<Range>.
One API (rangeFromLocationAndLength) may return nullptr, so its return type
is now RefPtr<Range>.
* editing/TextIterator.cpp:
(WebCore::TextIterator::range):
(WebCore::TextIterator::node):
(WebCore::SimplifiedBackwardsTextIterator::range):
(WebCore::CharacterIterator::range):
(WebCore::characterSubrange):
(WebCore::BackwardsCharacterIterator::range):
(WebCore::TextIterator::subrange):
(WebCore::TextIterator::rangeFromLocationAndLength):
(WebCore::TextIterator::getLocationAndLengthFromRange):
(WebCore::collapsedToBoundary):
(WebCore::findPlainText):
* editing/TextIterator.h:
Source/WebKit/mac:
* WebView/WebTextIterator.mm:
(-[WebTextIterator currentRange]):
Source/WebKit2:
* WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm:
(-[WKDOMTextIterator currentRange]):</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>
<li><a href="#trunkSourceWebCoreeditingTextIteratorh">trunk/Source/WebCore/editing/TextIterator.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebTextIteratormm">trunk/Source/WebKit/mac/WebView/WebTextIterator.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKDOMTextIteratormm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177587 => 177588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-19 19:42:24 UTC (rev 177587)
+++ trunk/Source/WebCore/ChangeLog 2014-12-19 19:48:06 UTC (rev 177588)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-12-19 Andreas Kling <akling@apple.com>
+
+ Ref-ify TextIterator API.
+ <https://webkit.org/b/139823>
+
+ Reviewed by Antti Koivisto.
+
+ Change TextIterator functions that always return Range objects to return
+ Ref<Range> instead of PassRefPtr<Range>.
+
+ One API (rangeFromLocationAndLength) may return nullptr, so its return type
+ is now RefPtr<Range>.
+
+ * editing/TextIterator.cpp:
+ (WebCore::TextIterator::range):
+ (WebCore::TextIterator::node):
+ (WebCore::SimplifiedBackwardsTextIterator::range):
+ (WebCore::CharacterIterator::range):
+ (WebCore::characterSubrange):
+ (WebCore::BackwardsCharacterIterator::range):
+ (WebCore::TextIterator::subrange):
+ (WebCore::TextIterator::rangeFromLocationAndLength):
+ (WebCore::TextIterator::getLocationAndLengthFromRange):
+ (WebCore::collapsedToBoundary):
+ (WebCore::findPlainText):
+ * editing/TextIterator.h:
+
</ins><span class="cx"> 2014-12-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: CRASH in inspector-protocol/debugger/terminate-dedicated-worker-while-paused.html
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (177587 => 177588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2014-12-19 19:42:24 UTC (rev 177587)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2014-12-19 19:48:06 UTC (rev 177588)
</span><span class="lines">@@ -1092,7 +1092,7 @@
</span><span class="cx"> m_hasEmitted = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> TextIterator::range() const
</del><ins>+Ref<Range> TextIterator::range() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!atEnd());
</span><span class="cx">
</span><span class="lines">@@ -1108,7 +1108,7 @@
</span><span class="cx">
</span><span class="cx"> Node* TextIterator::node() const
</span><span class="cx"> {
</span><del>- RefPtr<Range> textRange = range();
</del><ins>+ Ref<Range> textRange = range();
</ins><span class="cx">
</span><span class="cx"> Node* node = textRange->startContainer();
</span><span class="cx"> if (node->offsetInCharacters())
</span><span class="lines">@@ -1382,7 +1382,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> SimplifiedBackwardsTextIterator::range() const
</del><ins>+Ref<Range> SimplifiedBackwardsTextIterator::range() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!atEnd());
</span><span class="cx">
</span><span class="lines">@@ -1401,21 +1401,21 @@
</span><span class="cx"> m_underlyingIterator.advance();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> CharacterIterator::range() const
</del><ins>+Ref<Range> CharacterIterator::range() const
</ins><span class="cx"> {
</span><del>- RefPtr<Range> r = m_underlyingIterator.range();
</del><ins>+ Ref<Range> range = m_underlyingIterator.range();
</ins><span class="cx"> if (!m_underlyingIterator.atEnd()) {
</span><span class="cx"> if (m_underlyingIterator.text().length() <= 1) {
</span><span class="cx"> ASSERT(m_runOffset == 0);
</span><span class="cx"> } else {
</span><del>- Node* n = r->startContainer();
- ASSERT(n == r->endContainer());
- int offset = r->startOffset() + m_runOffset;
- r->setStart(n, offset);
- r->setEnd(n, offset + 1);
</del><ins>+ Node* n = range->startContainer();
+ ASSERT(n == range->endContainer());
+ int offset = range->startOffset() + m_runOffset;
+ range->setStart(n, offset);
+ range->setEnd(n, offset + 1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- return r.release();
</del><ins>+ return range;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CharacterIterator::advance(int count)
</span><span class="lines">@@ -1463,14 +1463,14 @@
</span><span class="cx"> m_runOffset = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Range> characterSubrange(CharacterIterator& it, int offset, int length)
</del><ins>+static Ref<Range> characterSubrange(CharacterIterator& it, int offset, int length)
</ins><span class="cx"> {
</span><span class="cx"> it.advance(offset);
</span><del>- RefPtr<Range> start = it.range();
</del><ins>+ Ref<Range> start = it.range();
</ins><span class="cx">
</span><span class="cx"> if (length > 1)
</span><span class="cx"> it.advance(length - 1);
</span><del>- RefPtr<Range> end = it.range();
</del><ins>+ Ref<Range> end = it.range();
</ins><span class="cx">
</span><span class="cx"> return Range::create(start->startContainer()->document(),
</span><span class="cx"> start->startContainer(), start->startOffset(),
</span><span class="lines">@@ -1487,9 +1487,9 @@
</span><span class="cx"> m_underlyingIterator.advance();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> BackwardsCharacterIterator::range() const
</del><ins>+Ref<Range> BackwardsCharacterIterator::range() const
</ins><span class="cx"> {
</span><del>- RefPtr<Range> r = m_underlyingIterator.range();
</del><ins>+ Ref<Range> r = m_underlyingIterator.range();
</ins><span class="cx"> if (!m_underlyingIterator.atEnd()) {
</span><span class="cx"> if (m_underlyingIterator.text().length() <= 1)
</span><span class="cx"> ASSERT(m_runOffset == 0);
</span><span class="lines">@@ -1501,7 +1501,7 @@
</span><span class="cx"> r->setEnd(n, offset);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return r.release();
</del><ins>+ return r;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BackwardsCharacterIterator::advance(int count)
</span><span class="lines">@@ -2379,7 +2379,7 @@
</span><span class="cx"> return length;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> TextIterator::subrange(Range* entireRange, int characterOffset, int characterCount)
</del><ins>+Ref<Range> TextIterator::subrange(Range* entireRange, int characterOffset, int characterCount)
</ins><span class="cx"> {
</span><span class="cx"> CharacterIterator entireRangeIterator(*entireRange);
</span><span class="cx"> return characterSubrange(entireRangeIterator, characterOffset, characterCount);
</span><span class="lines">@@ -2393,23 +2393,23 @@
</span><span class="cx"> return node && isRendererReplacedElement(node->renderer());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> TextIterator::rangeFromLocationAndLength(ContainerNode* scope, int rangeLocation, int rangeLength, bool forSelectionPreservation)
</del><ins>+RefPtr<Range> TextIterator::rangeFromLocationAndLength(ContainerNode* scope, int rangeLocation, int rangeLength, bool forSelectionPreservation)
</ins><span class="cx"> {
</span><del>- RefPtr<Range> resultRange = scope->document().createRange();
</del><ins>+ Ref<Range> resultRange = scope->document().createRange();
</ins><span class="cx">
</span><span class="cx"> int docTextPosition = 0;
</span><span class="cx"> int rangeEnd = rangeLocation + rangeLength;
</span><span class="cx"> bool startRangeFound = false;
</span><span class="cx">
</span><del>- RefPtr<Range> textRunRange = rangeOfContents(*scope);
</del><ins>+ Ref<Range> textRunRange = rangeOfContents(*scope);
</ins><span class="cx">
</span><del>- TextIterator it(textRunRange.get(), forSelectionPreservation ? TextIteratorEmitsCharactersBetweenAllVisiblePositions : TextIteratorDefaultBehavior);
</del><ins>+ TextIterator it(textRunRange.ptr(), forSelectionPreservation ? TextIteratorEmitsCharactersBetweenAllVisiblePositions : TextIteratorDefaultBehavior);
</ins><span class="cx">
</span><span class="cx"> // FIXME: the atEnd() check shouldn't be necessary, workaround for <http://bugs.webkit.org/show_bug.cgi?id=6289>.
</span><span class="cx"> if (!rangeLocation && !rangeLength && it.atEnd()) {
</span><span class="cx"> resultRange->setStart(textRunRange->startContainer(), 0);
</span><span class="cx"> resultRange->setEnd(textRunRange->startContainer(), 0);
</span><del>- return resultRange.release();
</del><ins>+ return WTF::move(resultRange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (; !it.atEnd(); it.advance()) {
</span><span class="lines">@@ -2425,7 +2425,7 @@
</span><span class="cx"> if (length == 1 && (it.text()[0] == '\n' || isInsideReplacedElement(it))) {
</span><span class="cx"> it.advance();
</span><span class="cx"> if (!it.atEnd()) {
</span><del>- RefPtr<Range> range = it.range();
</del><ins>+ Ref<Range> range = it.range();
</ins><span class="cx"> textRunRange->setEnd(range->startContainer(), range->startOffset());
</span><span class="cx"> } else {
</span><span class="cx"> Position runStart = textRunRange->startPosition();
</span><span class="lines">@@ -2472,7 +2472,7 @@
</span><span class="cx"> if (rangeLength && rangeEnd > docTextPosition) // rangeEnd is out of bounds
</span><span class="cx"> resultRange->setEnd(textRunRange->endContainer(), textRunRange->endOffset());
</span><span class="cx">
</span><del>- return resultRange.release();
</del><ins>+ return WTF::move(resultRange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TextIterator::getLocationAndLengthFromRange(Node* scope, const Range* range, size_t& location, size_t& length)
</span><span class="lines">@@ -2493,13 +2493,13 @@
</span><span class="cx"> if (range->endContainer() != scope && !range->endContainer()->isDescendantOf(scope))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<Range> testRange = Range::create(scope->document(), scope, 0, range->startContainer(), range->startOffset());
</del><ins>+ Ref<Range> testRange = Range::create(scope->document(), scope, 0, range->startContainer(), range->startOffset());
</ins><span class="cx"> ASSERT(testRange->startContainer() == scope);
</span><del>- location = TextIterator::rangeLength(testRange.get());
</del><ins>+ location = TextIterator::rangeLength(testRange.ptr());
</ins><span class="cx">
</span><span class="cx"> testRange->setEnd(range->endContainer(), range->endOffset(), IGNORE_EXCEPTION);
</span><span class="cx"> ASSERT(testRange->startContainer() == scope);
</span><del>- length = TextIterator::rangeLength(testRange.get()) - location;
</del><ins>+ length = TextIterator::rangeLength(testRange.ptr()) - location;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2538,11 +2538,11 @@
</span><span class="cx"> return plainText(range, defaultBehavior, isDisplayString).replace(noBreakSpace, ' ');
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Range> collapsedToBoundary(const Range& range, bool forward)
</del><ins>+static Ref<Range> collapsedToBoundary(const Range& range, bool forward)
</ins><span class="cx"> {
</span><del>- RefPtr<Range> result = range.cloneRange(ASSERT_NO_EXCEPTION);
</del><ins>+ Ref<Range> result = range.cloneRange(ASSERT_NO_EXCEPTION).releaseNonNull();
</ins><span class="cx"> result->collapse(!forward, ASSERT_NO_EXCEPTION);
</span><del>- return result.release();
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static size_t findPlainText(const Range& range, const String& target, FindOptions options, size_t& matchStart)
</span><span class="lines">@@ -2553,9 +2553,9 @@
</span><span class="cx"> SearchBuffer buffer(target, options);
</span><span class="cx">
</span><span class="cx"> if (buffer.needsMoreContext()) {
</span><del>- RefPtr<Range> beforeStartRange = range.ownerDocument().createRange();
</del><ins>+ Ref<Range> beforeStartRange = range.ownerDocument().createRange();
</ins><span class="cx"> beforeStartRange->setEnd(range.startContainer(), range.startOffset());
</span><del>- for (SimplifiedBackwardsTextIterator backwardsIterator(*beforeStartRange); !backwardsIterator.atEnd(); backwardsIterator.advance()) {
</del><ins>+ for (SimplifiedBackwardsTextIterator backwardsIterator(beforeStartRange.get()); !backwardsIterator.atEnd(); backwardsIterator.advance()) {
</ins><span class="cx"> buffer.prependContext(backwardsIterator.text());
</span><span class="cx"> if (!buffer.needsMoreContext())
</span><span class="cx"> break;
</span><span class="lines">@@ -2589,7 +2589,7 @@
</span><span class="cx"> return matchLength;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> findPlainText(const Range& range, const String& target, FindOptions options)
</del><ins>+Ref<Range> findPlainText(const Range& range, const String& target, FindOptions options)
</ins><span class="cx"> {
</span><span class="cx"> // First, find the text.
</span><span class="cx"> size_t matchStart;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.h (177587 => 177588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.h 2014-12-19 19:42:24 UTC (rev 177587)
+++ trunk/Source/WebCore/editing/TextIterator.h 2014-12-19 19:48:06 UTC (rev 177588)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String plainText(const Range*, TextIteratorBehavior = TextIteratorDefaultBehavior, bool isDisplayString = false);
</span><span class="cx"> WEBCORE_EXPORT String plainTextReplacingNoBreakSpace(const Range*, TextIteratorBehavior = TextIteratorDefaultBehavior, bool isDisplayString = false);
</span><del>-PassRefPtr<Range> findPlainText(const Range&, const String&, FindOptions);
</del><ins>+Ref<Range> findPlainText(const Range&, const String&, FindOptions);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Move this somewhere else in the editing directory. It doesn't belong here.
</span><span class="cx"> bool isRendererReplacedElement(RenderObject*);
</span><span class="lines">@@ -100,16 +100,16 @@
</span><span class="cx"> WEBCORE_EXPORT void advance();
</span><span class="cx">
</span><span class="cx"> StringView text() const { ASSERT(!atEnd()); return m_text; }
</span><del>- WEBCORE_EXPORT PassRefPtr<Range> range() const;
</del><ins>+ WEBCORE_EXPORT Ref<Range> range() const;
</ins><span class="cx"> WEBCORE_EXPORT Node* node() const;
</span><span class="cx">
</span><span class="cx"> const TextIteratorCopyableText& copyableText() const { ASSERT(!atEnd()); return m_copyableText; }
</span><span class="cx"> void appendTextToStringBuilder(StringBuilder& builder) const { copyableText().appendToStringBuilder(builder); }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static int rangeLength(const Range*, bool spacesForReplacedElements = false);
</span><del>- WEBCORE_EXPORT static PassRefPtr<Range> rangeFromLocationAndLength(ContainerNode* scope, int rangeLocation, int rangeLength, bool spacesForReplacedElements = false);
</del><ins>+ WEBCORE_EXPORT static RefPtr<Range> rangeFromLocationAndLength(ContainerNode* scope, int rangeLocation, int rangeLength, bool spacesForReplacedElements = false);
</ins><span class="cx"> WEBCORE_EXPORT static bool getLocationAndLengthFromRange(Node* scope, const Range*, size_t& location, size_t& length);
</span><del>- WEBCORE_EXPORT static PassRefPtr<Range> subrange(Range* entireRange, int characterOffset, int characterCount);
</del><ins>+ WEBCORE_EXPORT static Ref<Range> subrange(Range* entireRange, int characterOffset, int characterCount);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void exitNode();
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> void advance();
</span><span class="cx">
</span><span class="cx"> StringView text() const { ASSERT(!atEnd()); return m_text; }
</span><del>- WEBCORE_EXPORT PassRefPtr<Range> range() const;
</del><ins>+ WEBCORE_EXPORT Ref<Range> range() const;
</ins><span class="cx"> Node* node() const { ASSERT(!atEnd()); return m_node; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> void advance(int numCharacters);
</span><span class="cx">
</span><span class="cx"> StringView text() const { return m_underlyingIterator.text().substring(m_runOffset); }
</span><del>- PassRefPtr<Range> range() const;
</del><ins>+ Ref<Range> range() const;
</ins><span class="cx">
</span><span class="cx"> bool atBreak() const { return m_atBreak; }
</span><span class="cx"> int characterOffset() const { return m_offset; }
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> bool atEnd() const { return m_underlyingIterator.atEnd(); }
</span><span class="cx"> void advance(int numCharacters);
</span><span class="cx">
</span><del>- PassRefPtr<Range> range() const;
</del><ins>+ Ref<Range> range() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SimplifiedBackwardsTextIterator m_underlyingIterator;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177587 => 177588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-19 19:42:24 UTC (rev 177587)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-19 19:48:06 UTC (rev 177588)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-12-19 Andreas Kling <akling@apple.com>
+
+ Ref-ify TextIterator API.
+ <https://webkit.org/b/139823>
+
+ Reviewed by Antti Koivisto.
+
+ * WebView/WebTextIterator.mm:
+ (-[WebTextIterator currentRange]):
+
</ins><span class="cx"> 2014-12-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: CRASH inspector-protocol/debugger/breakpoint-action-detach.html
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebTextIteratormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebTextIterator.mm (177587 => 177588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebTextIterator.mm 2014-12-19 19:42:24 UTC (rev 177587)
+++ trunk/Source/WebKit/mac/WebView/WebTextIterator.mm 2014-12-19 19:48:06 UTC (rev 177588)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> WebCore::TextIterator& textIterator = *_private->_textIterator;
</span><span class="cx"> if (textIterator.atEnd())
</span><span class="cx"> return nullptr;
</span><del>- return kit(textIterator.range().get());
</del><ins>+ return kit(textIterator.range().ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Consider deprecating this method and creating one that does not require copying 8-bit characters.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177587 => 177588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-19 19:42:24 UTC (rev 177587)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-19 19:48:06 UTC (rev 177588)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-12-19 Andreas Kling <akling@apple.com>
+
+ Ref-ify TextIterator API.
+ <https://webkit.org/b/139823>
+
+ Reviewed by Antti Koivisto.
+
+ * WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm:
+ (-[WKDOMTextIterator currentRange]):
+
</ins><span class="cx"> 2014-12-19 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177574.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKDOMTextIteratormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm (177587 => 177588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm 2014-12-19 19:42:24 UTC (rev 177587)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm 2014-12-19 19:48:06 UTC (rev 177588)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> - (WKDOMRange *)currentRange
</span><span class="cx"> {
</span><del>- return WebKit::toWKDOMRange(_textIterator->range().get());
</del><ins>+ return WebKit::toWKDOMRange(_textIterator->range().ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Consider deprecating this method and creating one that does not require copying 8-bit characters.
</span></span></pre>
</div>
</div>
</body>
</html>