<!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>[177486] 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/177486">177486</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-12-17 19:06:00 -0800 (Wed, 17 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ref-ify Range::create().
<https://webkit.org/b/139755>
Reviewed by Anders Carlsson.
Source/WebCore:
* dom/Document.cpp:
(WebCore::acceptsEditingFocus):
* dom/Element.cpp:
(WebCore::Element::innerText):
* dom/Range.cpp:
(WebCore::Range::create):
(WebCore::Range::cloneRange):
(WebCore::rangeOfContents):
* dom/Range.h:
* editing/AlternativeTextController.cpp:
(WebCore::AlternativeTextController::applyAlternativeTextToRange):
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::replaceTextInNodePreservingMarkers):
* editing/VisibleUnits.cpp:
(WebCore::charactersAroundPosition):
* editing/markup.cpp:
(WebCore::StyledMarkupAccumulator::renderedText):
* page/FocusController.cpp:
(WebCore::relinquishesEditingFocus):
Source/WebKit/mac:
* WebView/WebHTMLRepresentation.mm:
(-[WebHTMLRepresentation attributedStringFrom:startOffset:to:endOffset:]):
* WebView/WebHTMLView.mm:
(-[WebHTMLView attributedString]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
<li><a href="#trunkSourceWebCoredomRangeh">trunk/Source/WebCore/dom/Range.h</a></li>
<li><a href="#trunkSourceWebCoreeditingAlternativeTextControllercpp">trunk/Source/WebCore/editing/AlternativeTextController.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitscpp">trunk/Source/WebCore/editing/VisibleUnits.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingmarkupcpp">trunk/Source/WebCore/editing/markup.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllercpp">trunk/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLRepresentationmm">trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebCore/ChangeLog 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-12-17 Andreas Kling <akling@apple.com>
+
+ Ref-ify Range::create().
+ <https://webkit.org/b/139755>
+
+ Reviewed by Anders Carlsson.
+
+ * dom/Document.cpp:
+ (WebCore::acceptsEditingFocus):
+ * dom/Element.cpp:
+ (WebCore::Element::innerText):
+ * dom/Range.cpp:
+ (WebCore::Range::create):
+ (WebCore::Range::cloneRange):
+ (WebCore::rangeOfContents):
+ * dom/Range.h:
+ * editing/AlternativeTextController.cpp:
+ (WebCore::AlternativeTextController::applyAlternativeTextToRange):
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::replaceTextInNodePreservingMarkers):
+ * editing/VisibleUnits.cpp:
+ (WebCore::charactersAroundPosition):
+ * editing/markup.cpp:
+ (WebCore::StyledMarkupAccumulator::renderedText):
+ * page/FocusController.cpp:
+ (WebCore::relinquishesEditingFocus):
+
</ins><span class="cx"> 2014-12-17 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/19282508> WebKitLegacy is unusable due to bad dylib identifier
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> if (!frame || !root)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return frame->editor().shouldBeginEditing(rangeOfContents(*root).get());
</del><ins>+ return frame->editor().shouldBeginEditing(rangeOfContents(*root).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool canAccessAncestor(const SecurityOrigin* activeSecurityOrigin, Frame* targetFrame)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -2100,7 +2100,7 @@
</span><span class="cx"> if (!renderer())
</span><span class="cx"> return textContent(true);
</span><span class="cx">
</span><del>- return plainText(rangeOfContents(*this).get());
</del><ins>+ return plainText(rangeOfContents(*this).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Element::outerText()
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebCore/dom/Range.cpp 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -72,9 +72,9 @@
</span><span class="cx"> m_ownerDocument->attachRange(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Range::create(Document& ownerDocument)
</del><ins>+Ref<Range> Range::create(Document& ownerDocument)
</ins><span class="cx"> {
</span><del>- return adoptRef(new Range(ownerDocument));
</del><ins>+ return adoptRef(*new Range(ownerDocument));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline Range::Range(Document& ownerDocument, PassRefPtr<Node> startContainer, int startOffset, PassRefPtr<Node> endContainer, int endOffset)
</span><span class="lines">@@ -94,26 +94,26 @@
</span><span class="cx"> setEnd(endContainer, endOffset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Range::create(Document& ownerDocument, PassRefPtr<Node> startContainer, int startOffset, PassRefPtr<Node> endContainer, int endOffset)
</del><ins>+Ref<Range> Range::create(Document& ownerDocument, PassRefPtr<Node> startContainer, int startOffset, PassRefPtr<Node> endContainer, int endOffset)
</ins><span class="cx"> {
</span><del>- return adoptRef(new Range(ownerDocument, startContainer, startOffset, endContainer, endOffset));
</del><ins>+ return adoptRef(*new Range(ownerDocument, startContainer, startOffset, endContainer, endOffset));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Range::create(Document& ownerDocument, const Position& start, const Position& end)
</del><ins>+Ref<Range> Range::create(Document& ownerDocument, const Position& start, const Position& end)
</ins><span class="cx"> {
</span><del>- return adoptRef(new Range(ownerDocument, start.containerNode(), start.computeOffsetInContainerNode(), end.containerNode(), end.computeOffsetInContainerNode()));
</del><ins>+ return adoptRef(*new Range(ownerDocument, start.containerNode(), start.computeOffsetInContainerNode(), end.containerNode(), end.computeOffsetInContainerNode()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Range::create(ScriptExecutionContext& context)
</del><ins>+Ref<Range> Range::create(ScriptExecutionContext& context)
</ins><span class="cx"> {
</span><del>- return adoptRef(new Range(downcast<Document>(context)));
</del><ins>+ return adoptRef(*new Range(downcast<Document>(context)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Range::create(Document& ownerDocument, const VisiblePosition& visibleStart, const VisiblePosition& visibleEnd)
</del><ins>+Ref<Range> Range::create(Document& ownerDocument, const VisiblePosition& visibleStart, const VisiblePosition& visibleEnd)
</ins><span class="cx"> {
</span><span class="cx"> Position start = visibleStart.deepEquivalent().parentAnchoredEquivalent();
</span><span class="cx"> Position end = visibleEnd.deepEquivalent().parentAnchoredEquivalent();
</span><del>- return adoptRef(new Range(ownerDocument, start.anchorNode(), start.deprecatedEditingOffset(), end.anchorNode(), end.deprecatedEditingOffset()));
</del><ins>+ return adoptRef(*new Range(ownerDocument, start.anchorNode(), start.deprecatedEditingOffset(), end.anchorNode(), end.deprecatedEditingOffset()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Range::~Range()
</span><span class="lines">@@ -1220,11 +1220,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Range::cloneRange(ExceptionCode& ec) const
</del><ins>+RefPtr<Range> Range::cloneRange(ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_start.container()) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return Range::create(ownerDocument(), m_start.container(), m_start.offset(), m_end.container(), m_end.offset());
</span><span class="lines">@@ -2002,12 +2002,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> rangeOfContents(Node& node)
</del><ins>+Ref<Range> rangeOfContents(Node& node)
</ins><span class="cx"> {
</span><del>- RefPtr<Range> range = Range::create(node.document());
</del><ins>+ Ref<Range> range = Range::create(node.document());
</ins><span class="cx"> int exception = 0;
</span><span class="cx"> range->selectNodeContents(&node, exception);
</span><del>- return range.release();
</del><ins>+ return range;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline void boundaryNodeChildrenChanged(RangeBoundaryPoint& boundary, ContainerNode& container)
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebCore/dom/Range.h 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -52,11 +52,11 @@
</span><span class="cx">
</span><span class="cx"> class Range : public RefCounted<Range> {
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT static PassRefPtr<Range> create(Document&);
- WEBCORE_EXPORT static PassRefPtr<Range> create(Document&, PassRefPtr<Node> startContainer, int startOffset, PassRefPtr<Node> endContainer, int endOffset);
- WEBCORE_EXPORT static PassRefPtr<Range> create(Document&, const Position&, const Position&);
- WEBCORE_EXPORT static PassRefPtr<Range> create(ScriptExecutionContext&);
- WEBCORE_EXPORT static PassRefPtr<Range> create(Document&, const VisiblePosition&, const VisiblePosition&);
</del><ins>+ WEBCORE_EXPORT static Ref<Range> create(Document&);
+ WEBCORE_EXPORT static Ref<Range> create(Document&, PassRefPtr<Node> startContainer, int startOffset, PassRefPtr<Node> endContainer, int endOffset);
+ WEBCORE_EXPORT static Ref<Range> create(Document&, const Position&, const Position&);
+ WEBCORE_EXPORT static Ref<Range> create(ScriptExecutionContext&);
+ WEBCORE_EXPORT static Ref<Range> create(Document&, const VisiblePosition&, const VisiblePosition&);
</ins><span class="cx"> WEBCORE_EXPORT ~Range();
</span><span class="cx">
</span><span class="cx"> Document& ownerDocument() const { return const_cast<Document&>(m_ownerDocument.get()); }
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> PassRefPtr<DocumentFragment> createContextualFragment(const String& html, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> void detach(ExceptionCode&);
</span><del>- WEBCORE_EXPORT PassRefPtr<Range> cloneRange(ExceptionCode&) const;
</del><ins>+ WEBCORE_EXPORT RefPtr<Range> cloneRange(ExceptionCode&) const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setStartAfter(Node*, ExceptionCode& = ASSERT_NO_EXCEPTION);
</span><span class="cx"> WEBCORE_EXPORT void setEndBefore(Node*, ExceptionCode& = ASSERT_NO_EXCEPTION);
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> RangeBoundaryPoint m_end;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-PassRefPtr<Range> rangeOfContents(Node&);
</del><ins>+Ref<Range> rangeOfContents(Node&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool areRangesEqual(const Range*, const Range*);
</span><span class="cx"> bool rangesOverlap(const Range*, const Range*);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingAlternativeTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/AlternativeTextController.cpp (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/AlternativeTextController.cpp 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebCore/editing/AlternativeTextController.cpp 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> RefPtr<Range> rangeWithAlternative = range->cloneRange(ec);
</span><span class="cx">
</span><span class="cx"> ContainerNode& rootNode = paragraphRangeContainingCorrection.get()->startContainer()->treeScope().rootNode();
</span><del>- int paragraphStartIndex = TextIterator::rangeLength(Range::create(rootNode.document(), &rootNode, 0, paragraphRangeContainingCorrection.get()->startContainer(), paragraphRangeContainingCorrection.get()->startOffset()).get());
</del><ins>+ int paragraphStartIndex = TextIterator::rangeLength(Range::create(rootNode.document(), &rootNode, 0, paragraphRangeContainingCorrection->startContainer(), paragraphRangeContainingCorrection->startOffset()).ptr());
</ins><span class="cx"> applyCommand(SpellingCorrectionCommand::create(rangeWithAlternative, alternative));
</span><span class="cx"> // Recalculate pragraphRangeContainingCorrection, since SpellingCorrectionCommand modified the DOM, such that the original paragraphRangeContainingCorrection is no longer valid. Radar: 10305315 Bugzilla: 89526
</span><span class="cx"> paragraphRangeContainingCorrection = TextIterator::rangeFromLocationAndLength(&rootNode, paragraphStartIndex, correctionStartOffsetInParagraph + alternative.length());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -569,7 +569,7 @@
</span><span class="cx"> RefPtr<Text> node(prpNode);
</span><span class="cx"> DocumentMarkerController& markerController = document().markers();
</span><span class="cx"> Vector<RenderedDocumentMarker> markers;
</span><del>- copyMarkers(markerController.markersInRange(Range::create(document(), node, offset, node, offset + count).get(), DocumentMarker::AllMarkers()), markers);
</del><ins>+ copyMarkers(markerController.markersInRange(Range::create(document(), node, offset, node, offset + count).ptr(), DocumentMarker::AllMarkers()), markers);
</ins><span class="cx"> replaceTextInNode(node, offset, count, replacementText);
</span><span class="cx"> RefPtr<Range> newRange = Range::create(document(), node, offset, node, offset + replacementText.length());
</span><span class="cx"> for (const auto& marker : markers)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -1830,7 +1830,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (startPosition != endPosition) {
</span><del>- String characterString = plainText(Range::create(position.deepEquivalent().anchorNode()->document(), startPosition, endPosition).get()).replace(noBreakSpace, ' ');
</del><ins>+ String characterString = plainText(Range::create(position.deepEquivalent().anchorNode()->document(), startPosition, endPosition).ptr()).replace(noBreakSpace, ' ');
</ins><span class="cx"> for (int i = characterString.length() - 1, index = 0; i >= 0 && index < maxCharacters; --i) {
</span><span class="cx"> if (!index && nextPosition.isNull())
</span><span class="cx"> index++;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/markup.cpp (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/markup.cpp 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebCore/editing/markup.cpp 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx">
</span><span class="cx"> Position start = createLegacyEditingPosition(const_cast<Node*>(&node), startOffset);
</span><span class="cx"> Position end = createLegacyEditingPosition(const_cast<Node*>(&node), endOffset);
</span><del>- return plainText(Range::create(node.document(), start, end).get(), behavior);
</del><ins>+ return plainText(Range::create(node.document(), start, end).ptr(), behavior);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String StyledMarkupAccumulator::stringValueForRange(const Node& node, const Range* range)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.cpp (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.cpp 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebCore/page/FocusController.cpp 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> if (!frame || !root)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return frame->editor().shouldEndEditing(rangeOfContents(*root).get());
</del><ins>+ return frame->editor().shouldEndEditing(rangeOfContents(*root).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void clearSelectionIfNeeded(Frame* oldFocusedFrame, Frame* newFocusedFrame, Node* newFocusedNode)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-12-17 Andreas Kling <akling@apple.com>
+
+ Ref-ify Range::create().
+ <https://webkit.org/b/139755>
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebHTMLRepresentation.mm:
+ (-[WebHTMLRepresentation attributedStringFrom:startOffset:to:endOffset:]):
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView attributedString]):
+
</ins><span class="cx"> 2014-12-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Unify -[WebResource description]
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLRepresentationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSAttributedString *)attributedStringFrom:(DOMNode *)startNode startOffset:(int)startOffset to:(DOMNode *)endNode endOffset:(int)endOffset
</span><span class="cx"> {
</span><del>- return editingAttributedStringFromRange(*Range::create(core(startNode)->document(), core(startNode), startOffset, core(endNode), endOffset));
</del><ins>+ return editingAttributedStringFromRange(Range::create(core(startNode)->document(), core(startNode), startOffset, core(endNode), endOffset));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (177485 => 177486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-12-18 02:12:18 UTC (rev 177485)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-12-18 03:06:00 UTC (rev 177486)
</span><span class="lines">@@ -6717,7 +6717,7 @@
</span><span class="cx"> NSAttributedString *attributedString = [self _attributeStringFromDOMRange:[document _documentRange]];
</span><span class="cx"> if (!attributedString) {
</span><span class="cx"> Document* coreDocument = core(document);
</span><del>- attributedString = editingAttributedStringFromRange(*Range::create(*coreDocument, coreDocument, 0, coreDocument, coreDocument->countChildNodes()));
</del><ins>+ attributedString = editingAttributedStringFromRange(Range::create(*coreDocument, coreDocument, 0, coreDocument, coreDocument->countChildNodes()));
</ins><span class="cx"> }
</span><span class="cx"> return attributedString;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>