<!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>[199817] 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/199817">199817</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-21 09:07:18 -0700 (Thu, 21 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop [UsePointersEvenForNonNullableObjectArguments] from Range
https://bugs.webkit.org/show_bug.cgi?id=156805
Reviewed by Youenn Fablet.
Source/WebCore:
No new tests, no web-exposed behavior change.
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::rangeForNodeContents):
(WebCore::characterOffsetsInOrder):
(WebCore::setRangeStartOrEndWithCharacterOffset):
(WebCore::AXObjectCache::startOrEndCharacterOffsetForRange):
(WebCore::AXObjectCache::previousBoundary):
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::selectText):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::documentBasedSelectedTextRange):
* dom/Node.cpp:
(WebCore::Node::textRects):
* dom/Range.cpp:
(WebCore::Range::Range):
(WebCore::Range::setDocument):
(WebCore::Range::setStart):
(WebCore::Range::setEnd):
(WebCore::Range::isPointInRange):
(WebCore::Range::comparePoint):
(WebCore::Range::compareNode):
(WebCore::Range::compareBoundaryPoints):
(WebCore::Range::compareBoundaryPointsForBindings):
(WebCore::Range::intersectsNode):
(WebCore::Range::processContents):
(WebCore::Range::insertNode):
(WebCore::Range::checkNodeWOffset):
(WebCore::Range::setStartAfter):
(WebCore::Range::setEndBefore):
(WebCore::Range::setEndAfter):
(WebCore::Range::selectNode):
(WebCore::Range::selectNodeContents):
(WebCore::Range::surroundContents):
(WebCore::Range::setStartBefore):
(WebCore::Range::contains):
(WebCore::rangesOverlap):
(WebCore::rangeOfContents):
(WebCore::boundaryNodeChildrenWillBeRemoved):
(WebCore::boundaryTextNodesMerged):
(WebCore::boundaryTextNodesSplit):
(WebCore::Range::expand):
(WebCore::checkForDifferentRootContainer): Deleted.
(WebCore::highestAncestorUnderCommonRoot): Deleted.
(WebCore::childOfCommonRootBeforeOffset): Deleted.
(WebCore::deleteCharacterData): Deleted.
(WebCore::Range::toString): Deleted.
(WebCore::Range::toHTML): Deleted.
(WebCore::Range::text): Deleted.
(WebCore::Range::cloneRange): Deleted.
(WebCore::Range::absoluteTextRects): Deleted.
(WebCore::Range::absoluteTextQuads): Deleted.
(WebCore::boundaryNodeChildrenChanged): Deleted.
(WebCore::boundaryNodeWillBeRemoved): Deleted.
(WebCore::Range::nodeWillBeRemoved): Deleted.
(WebCore::boundaryTextRemoved): Deleted.
(WebCore::Range::getBoundingClientRect): Deleted.
(WebCore::Range::getBorderAndTextQuads): Deleted.
* dom/Range.h:
* dom/Range.idl:
* dom/RangeBoundaryPoint.h:
(WebCore::RangeBoundaryPoint::set):
(WebCore::RangeBoundaryPoint::setToStartOfNode):
(WebCore::RangeBoundaryPoint::setToEndOfNode):
* editing/AlternativeTextController.cpp:
(WebCore::AlternativeTextController::applyAlternativeTextToRange):
* editing/ApplyStyleCommand.cpp:
(WebCore::ApplyStyleCommand::fixRangeAndApplyInlineStyle):
* editing/Editor.cpp:
(WebCore::Editor::advanceToNextMisspelling):
(WebCore::Editor::rangeOfString):
(WebCore::isFrameInRange):
(WebCore::Editor::countMatchesForText):
* editing/EditorCommand.cpp:
(WebCore::unionDOMRanges):
(WebCore::executeDeleteToMark):
(WebCore::executeSelectToMark):
* editing/FormatBlockCommand.cpp:
(WebCore::FormatBlockCommand::formatRange):
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::respondToNodeModification):
* editing/InsertListCommand.cpp:
(WebCore::InsertListCommand::doApplyForSingleParagraph):
* editing/TextCheckingHelper.cpp:
(WebCore::TextCheckingParagraph::offsetTo):
* editing/TextIterator.cpp:
(WebCore::CharacterIterator::range):
(WebCore::BackwardsCharacterIterator::range):
(WebCore::TextIterator::rangeFromLocationAndLength):
(WebCore::TextIterator::getLocationAndLengthFromRange):
(WebCore::findPlainText):
* editing/VisiblePosition.cpp:
(WebCore::setStart):
(WebCore::setEnd):
* editing/VisibleSelection.cpp:
(WebCore::makeSearchRange):
* editing/VisibleUnits.cpp:
(WebCore::previousBoundary):
(WebCore::nextBoundary):
* editing/htmlediting.cpp:
(WebCore::visiblePositionForIndexUsingCharacterIterator):
(WebCore::isNodeVisiblyContainedWithin):
* editing/htmlediting.h:
* editing/mac/EditorMac.mm:
(WebCore::Editor::adjustedSelectionRange):
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::contextMenuItemSelected):
* page/DOMSelection.cpp:
(WebCore::DOMSelection::addRange):
* page/DragController.cpp:
(WebCore::selectElement):
* page/EventHandler.cpp:
(WebCore::EventHandler::dispatchMouseEvent):
* page/Page.cpp:
(WebCore::Page::findStringMatchingRanges):
* page/TextIndicator.cpp:
(WebCore::hasNonInlineOrReplacedElements):
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::getRanges):
Source/WebKit/mac:
* WebView/WebFrame.mm:
(-[WebFrame _smartDeleteRangeForProposedRange:]):
Source/WebKit2:
* WebProcess/InjectedBundle/API/mac/WKDOMRange.mm:
(-[WKDOMRange setStart:offset:]):
(-[WKDOMRange setEnd:offset:]):
(-[WKDOMRange selectNode:]):
(-[WKDOMRange selectNodeContents:]):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::contentsAsString):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleUtilcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMUIKitExtensionsmm">trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.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="#trunkSourceWebCoredomRangeidl">trunk/Source/WebCore/dom/Range.idl</a></li>
<li><a href="#trunkSourceWebCoredomRangeBoundaryPointh">trunk/Source/WebCore/dom/RangeBoundaryPoint.h</a></li>
<li><a href="#trunkSourceWebCoreeditingAlternativeTextControllercpp">trunk/Source/WebCore/editing/AlternativeTextController.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyStyleCommandcpp">trunk/Source/WebCore/editing/ApplyStyleCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorCommandcpp">trunk/Source/WebCore/editing/EditorCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFormatBlockCommandcpp">trunk/Source/WebCore/editing/FormatBlockCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectionh">trunk/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertListCommandcpp">trunk/Source/WebCore/editing/InsertListCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextCheckingHelpercpp">trunk/Source/WebCore/editing/TextCheckingHelper.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingVisiblePositioncpp">trunk/Source/WebCore/editing/VisiblePosition.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleSelectioncpp">trunk/Source/WebCore/editing/VisibleSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitscpp">trunk/Source/WebCore/editing/VisibleUnits.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingcpp">trunk/Source/WebCore/editing/htmlediting.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingh">trunk/Source/WebCore/editing/htmlediting.h</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllercpp">trunk/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMSelectioncpp">trunk/Source/WebCore/page/DOMSelection.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepageTextIndicatorcpp">trunk/Source/WebCore/page/TextIndicator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadcpp">trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKDOMRangemm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/ChangeLog 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -1,5 +1,132 @@
</span><span class="cx"> 2016-04-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Drop [UsePointersEvenForNonNullableObjectArguments] from Range
+ https://bugs.webkit.org/show_bug.cgi?id=156805
+
+ Reviewed by Youenn Fablet.
+
+ No new tests, no web-exposed behavior change.
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::rangeForNodeContents):
+ (WebCore::characterOffsetsInOrder):
+ (WebCore::setRangeStartOrEndWithCharacterOffset):
+ (WebCore::AXObjectCache::startOrEndCharacterOffsetForRange):
+ (WebCore::AXObjectCache::previousBoundary):
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::selectText):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::documentBasedSelectedTextRange):
+ * dom/Node.cpp:
+ (WebCore::Node::textRects):
+ * dom/Range.cpp:
+ (WebCore::Range::Range):
+ (WebCore::Range::setDocument):
+ (WebCore::Range::setStart):
+ (WebCore::Range::setEnd):
+ (WebCore::Range::isPointInRange):
+ (WebCore::Range::comparePoint):
+ (WebCore::Range::compareNode):
+ (WebCore::Range::compareBoundaryPoints):
+ (WebCore::Range::compareBoundaryPointsForBindings):
+ (WebCore::Range::intersectsNode):
+ (WebCore::Range::processContents):
+ (WebCore::Range::insertNode):
+ (WebCore::Range::checkNodeWOffset):
+ (WebCore::Range::setStartAfter):
+ (WebCore::Range::setEndBefore):
+ (WebCore::Range::setEndAfter):
+ (WebCore::Range::selectNode):
+ (WebCore::Range::selectNodeContents):
+ (WebCore::Range::surroundContents):
+ (WebCore::Range::setStartBefore):
+ (WebCore::Range::contains):
+ (WebCore::rangesOverlap):
+ (WebCore::rangeOfContents):
+ (WebCore::boundaryNodeChildrenWillBeRemoved):
+ (WebCore::boundaryTextNodesMerged):
+ (WebCore::boundaryTextNodesSplit):
+ (WebCore::Range::expand):
+ (WebCore::checkForDifferentRootContainer): Deleted.
+ (WebCore::highestAncestorUnderCommonRoot): Deleted.
+ (WebCore::childOfCommonRootBeforeOffset): Deleted.
+ (WebCore::deleteCharacterData): Deleted.
+ (WebCore::Range::toString): Deleted.
+ (WebCore::Range::toHTML): Deleted.
+ (WebCore::Range::text): Deleted.
+ (WebCore::Range::cloneRange): Deleted.
+ (WebCore::Range::absoluteTextRects): Deleted.
+ (WebCore::Range::absoluteTextQuads): Deleted.
+ (WebCore::boundaryNodeChildrenChanged): Deleted.
+ (WebCore::boundaryNodeWillBeRemoved): Deleted.
+ (WebCore::Range::nodeWillBeRemoved): Deleted.
+ (WebCore::boundaryTextRemoved): Deleted.
+ (WebCore::Range::getBoundingClientRect): Deleted.
+ (WebCore::Range::getBorderAndTextQuads): Deleted.
+ * dom/Range.h:
+ * dom/Range.idl:
+ * dom/RangeBoundaryPoint.h:
+ (WebCore::RangeBoundaryPoint::set):
+ (WebCore::RangeBoundaryPoint::setToStartOfNode):
+ (WebCore::RangeBoundaryPoint::setToEndOfNode):
+ * editing/AlternativeTextController.cpp:
+ (WebCore::AlternativeTextController::applyAlternativeTextToRange):
+ * editing/ApplyStyleCommand.cpp:
+ (WebCore::ApplyStyleCommand::fixRangeAndApplyInlineStyle):
+ * editing/Editor.cpp:
+ (WebCore::Editor::advanceToNextMisspelling):
+ (WebCore::Editor::rangeOfString):
+ (WebCore::isFrameInRange):
+ (WebCore::Editor::countMatchesForText):
+ * editing/EditorCommand.cpp:
+ (WebCore::unionDOMRanges):
+ (WebCore::executeDeleteToMark):
+ (WebCore::executeSelectToMark):
+ * editing/FormatBlockCommand.cpp:
+ (WebCore::FormatBlockCommand::formatRange):
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::respondToNodeModification):
+ * editing/InsertListCommand.cpp:
+ (WebCore::InsertListCommand::doApplyForSingleParagraph):
+ * editing/TextCheckingHelper.cpp:
+ (WebCore::TextCheckingParagraph::offsetTo):
+ * editing/TextIterator.cpp:
+ (WebCore::CharacterIterator::range):
+ (WebCore::BackwardsCharacterIterator::range):
+ (WebCore::TextIterator::rangeFromLocationAndLength):
+ (WebCore::TextIterator::getLocationAndLengthFromRange):
+ (WebCore::findPlainText):
+ * editing/VisiblePosition.cpp:
+ (WebCore::setStart):
+ (WebCore::setEnd):
+ * editing/VisibleSelection.cpp:
+ (WebCore::makeSearchRange):
+ * editing/VisibleUnits.cpp:
+ (WebCore::previousBoundary):
+ (WebCore::nextBoundary):
+ * editing/htmlediting.cpp:
+ (WebCore::visiblePositionForIndexUsingCharacterIterator):
+ (WebCore::isNodeVisiblyContainedWithin):
+ * editing/htmlediting.h:
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::adjustedSelectionRange):
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::contextMenuItemSelected):
+ * page/DOMSelection.cpp:
+ (WebCore::DOMSelection::addRange):
+ * page/DragController.cpp:
+ (WebCore::selectElement):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::dispatchMouseEvent):
+ * page/Page.cpp:
+ (WebCore::Page::findStringMatchingRanges):
+ * page/TextIndicator.cpp:
+ (WebCore::hasNonInlineOrReplacedElements):
+ * rendering/RenderNamedFlowThread.cpp:
+ (WebCore::RenderNamedFlowThread::getRanges):
+
+2016-04-21 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Drop [UsePointersEvenForNonNullableObjectArguments] from DOMURL
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156797
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -1606,7 +1606,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> RefPtr<Range> range = Range::create(*document);
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- range->selectNodeContents(node, ec);
</del><ins>+ range->selectNodeContents(*node, ec);
</ins><span class="cx"> return ec ? nullptr : range;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1635,7 +1635,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> range1 = AXObjectCache::rangeForNodeContents(node1);
</span><span class="cx"> RefPtr<Range> range2 = AXObjectCache::rangeForNodeContents(node2);
</span><del>- return range1->compareBoundaryPoints(Range::START_TO_START, range2.get(), IGNORE_EXCEPTION) <= 0;
</del><ins>+
+ return !range2 || range1->compareBoundaryPoints(Range::START_TO_START, *range2, IGNORE_EXCEPTION) <= 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Node* resetNodeAndOffsetForReplacedNode(Node* replacedNode, int& offset, int characterCount)
</span><span class="lines">@@ -1663,6 +1664,7 @@
</span><span class="cx">
</span><span class="cx"> int offset = characterOffset.startIndex + characterOffset.offset;
</span><span class="cx"> Node* node = characterOffset.node;
</span><ins>+ ASSERT(node);
</ins><span class="cx">
</span><span class="cx"> bool replacedNodeOrBR = isReplacedNodeOrBR(node);
</span><span class="cx"> // For the non text node that has no children, we should create the range with its parent, otherwise the range would be collapsed.
</span><span class="lines">@@ -1673,10 +1675,15 @@
</span><span class="cx"> if (replacedNodeOrBR || noChildren)
</span><span class="cx"> node = resetNodeAndOffsetForReplacedNode(node, offset, characterCount);
</span><span class="cx">
</span><ins>+ if (!node) {
+ ec = TypeError;
+ return;
+ }
+
</ins><span class="cx"> if (isStart)
</span><del>- range->setStart(node, offset, ec);
</del><ins>+ range->setStart(*node, offset, ec);
</ins><span class="cx"> else
</span><del>- range->setEnd(node, offset, ec);
</del><ins>+ range->setEnd(*node, offset, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> AXObjectCache::rangeForUnorderedCharacterOffsets(const CharacterOffset& characterOffset1, const CharacterOffset& characterOffset2)
</span><span class="lines">@@ -1743,18 +1750,18 @@
</span><span class="cx"> // If it's end text marker, we want to go to the end of the range, and stay within the range.
</span><span class="cx"> bool stayWithinRange = !isStart;
</span><span class="cx">
</span><del>- RefPtr<Range> copyRange = range;
</del><ins>+ Ref<Range> copyRange = *range;
</ins><span class="cx"> // Change the start of the range, so the character offset starts from node beginning.
</span><span class="cx"> int offset = 0;
</span><del>- Node* node = &copyRange->startContainer();
- if (node->offsetInCharacters()) {
</del><ins>+ Node& node = copyRange->startContainer();
+ if (node.offsetInCharacters()) {
</ins><span class="cx"> copyRange = Range::create(range->ownerDocument(), &range->startContainer(), range->startOffset(), &range->endContainer(), range->endOffset());
</span><del>- CharacterOffset nodeStartOffset = traverseToOffsetInRange(rangeForNodeContents(node), 0);
</del><ins>+ CharacterOffset nodeStartOffset = traverseToOffsetInRange(rangeForNodeContents(&node), 0);
</ins><span class="cx"> offset = std::max(copyRange->startOffset() - nodeStartOffset.startIndex, 0);
</span><span class="cx"> copyRange->setStart(node, nodeStartOffset.startIndex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return traverseToOffsetInRange(copyRange, offset, isStart ? TraverseOptionDefault : TraverseOptionToNodeEnd, stayWithinRange);
</del><ins>+ return traverseToOffsetInRange(WTFMove(copyRange), offset, isStart ? TraverseOptionDefault : TraverseOptionToNodeEnd, stayWithinRange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AXObjectCache::startOrEndTextMarkerDataForRange(TextMarkerData& textMarkerData, RefPtr<Range> range, bool isStart)
</span><span class="lines">@@ -2213,7 +2220,7 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> if (requiresContextForWordBoundary(characterBefore(characterOffset))) {
</span><span class="cx"> RefPtr<Range> forwardsScanRange(boundary->document().createRange());
</span><del>- forwardsScanRange->setEndAfter(boundary, ec);
</del><ins>+ forwardsScanRange->setEndAfter(*boundary, ec);
</ins><span class="cx"> setRangeStartOrEndWithCharacterOffset(forwardsScanRange, characterOffset, true, ec);
</span><span class="cx"> suffixLength = suffixLengthForRange(forwardsScanRange, string);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -737,7 +737,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> selectedStringRange = selectionRange();
</span><span class="cx"> // When starting our search again, make this a zero length range so that search forwards will find this selected range if its appropriate.
</span><del>- selectedStringRange->setEnd(&selectedStringRange->startContainer(), selectedStringRange->startOffset());
</del><ins>+ selectedStringRange->setEnd(selectedStringRange->startContainer(), selectedStringRange->startOffset());
</ins><span class="cx">
</span><span class="cx"> RefPtr<Range> closestAfterStringRange = nullptr;
</span><span class="cx"> RefPtr<Range> closestBeforeStringRange = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -1434,7 +1434,7 @@
</span><span class="cx">
</span><span class="cx"> VisibleSelection visibleSelection = selection();
</span><span class="cx"> RefPtr<Range> currentSelectionRange = visibleSelection.toNormalizedRange();
</span><del>- if (!currentSelectionRange || !currentSelectionRange->intersectsNode(node, IGNORE_EXCEPTION))
</del><ins>+ if (!currentSelectionRange || !currentSelectionRange->intersectsNode(*node, IGNORE_EXCEPTION))
</ins><span class="cx"> return PlainTextRange();
</span><span class="cx">
</span><span class="cx"> int start = indexForVisiblePosition(visibleSelection.start());
</span><span class="lines">@@ -1513,8 +1513,9 @@
</span><span class="cx"> HTMLTextFormControlElement& textControl = downcast<RenderTextControl>(*m_renderer).textFormControlElement();
</span><span class="cx"> textControl.setSelectionRange(range.start, range.start + range.length);
</span><span class="cx"> } else {
</span><del>- VisiblePosition start = visiblePositionForIndexUsingCharacterIterator(node(), range.start);
- VisiblePosition end = visiblePositionForIndexUsingCharacterIterator(node(), range.start + range.length);
</del><ins>+ ASSERT(node());
+ VisiblePosition start = visiblePositionForIndexUsingCharacterIterator(*node(), range.start);
+ VisiblePosition end = visiblePositionForIndexUsingCharacterIterator(*node(), range.start + range.length);
</ins><span class="cx"> m_renderer->frame().selection().setSelection(VisibleSelection(start, end), FrameSelection::defaultSetSelectionOptions(UserTriggered));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1876,7 +1877,7 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return VisiblePosition();
</span><span class="cx">
</span><del>- return visiblePositionForIndexUsingCharacterIterator(node, index);
</del><ins>+ return visiblePositionForIndexUsingCharacterIterator(*node, index);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int AccessibilityRenderObject::indexForVisiblePosition(const VisiblePosition& pos) const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleUtilcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> // node is actually inside the region, at least partially.
</span><span class="cx"> Node* node = coreObject->node();
</span><span class="cx"> Node* lastDescendant = node->lastDescendant();
</span><del>- return (range->intersectsNode(node, IGNORE_EXCEPTION)
</del><ins>+ return (range->intersectsNode(*node, IGNORE_EXCEPTION)
</ins><span class="cx"> && (&range->endContainer() != node || range->endOffset())
</span><span class="cx"> && (&range->startContainer() != lastDescendant || range->startOffset() != lastOffsetInNode(lastDescendant)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -2131,7 +2131,7 @@
</span><span class="cx"> int startPosition = TextIterator::rangeLength(testRange.get());
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec;
</span><del>- testRange->setEnd(&range->endContainer(), range->endOffset(), ec);
</del><ins>+ testRange->setEnd(range->endContainer(), range->endOffset(), ec);
</ins><span class="cx"> ASSERT(&testRange->startContainer() == scope);
</span><span class="cx"> int endPosition = TextIterator::rangeLength(testRange.get());
</span><span class="cx"> return NSMakeRange(startPosition, endPosition - startPosition);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMUIKitExtensionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -113,8 +113,10 @@
</span><span class="cx"> ExceptionCode ignored;
</span><span class="cx"> Position start = frameSelection.selection().start().parentAnchoredEquivalent();
</span><span class="cx"> Position end = frameSelection.selection().end().parentAnchoredEquivalent();
</span><del>- range->setStart(start.containerNode(), start.offsetInContainerNode(), ignored);
- range->setEnd(end.containerNode(), end.offsetInContainerNode(), ignored);
</del><ins>+ if (start.containerNode())
+ range->setStart(*start.containerNode(), start.offsetInContainerNode(), ignored);
+ if (end.containerNode())
+ range->setEnd(*end.containerNode(), end.offsetInContainerNode(), ignored);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)extend:(UInt32)amount inDirection:(WebTextAdjustmentDirection)direction
</span><span class="lines">@@ -129,8 +131,10 @@
</span><span class="cx"> ExceptionCode ignored;
</span><span class="cx"> Position start = frameSelection.selection().start().parentAnchoredEquivalent();
</span><span class="cx"> Position end = frameSelection.selection().end().parentAnchoredEquivalent();
</span><del>- range->setStart(start.containerNode(), start.offsetInContainerNode(), ignored);
- range->setEnd(end.containerNode(), end.offsetInContainerNode(), ignored);
</del><ins>+ if (start.containerNode())
+ range->setStart(*start.containerNode(), start.offsetInContainerNode(), ignored);
+ if (end.containerNode())
+ range->setEnd(*end.containerNode(), end.offsetInContainerNode(), ignored);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMNode *)firstNode
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -2314,7 +2314,7 @@
</span><span class="cx"> void Node::textRects(Vector<IntRect>& rects) const
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Range> range = Range::create(document());
</span><del>- range->selectNodeContents(const_cast<Node*>(this), IGNORE_EXCEPTION);
</del><ins>+ range->selectNodeContents(const_cast<Node&>(*this), IGNORE_EXCEPTION);
</ins><span class="cx"> range->absoluteTextRects(rects);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/dom/Range.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> return adoptRef(*new Range(ownerDocument));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: startContainer and endContainer should probably be Ref<Node>&&.
</ins><span class="cx"> inline Range::Range(Document& ownerDocument, PassRefPtr<Node> startContainer, int startOffset, PassRefPtr<Node> endContainer, int endOffset)
</span><span class="cx"> : m_ownerDocument(ownerDocument)
</span><span class="cx"> , m_start(&ownerDocument)
</span><span class="lines">@@ -93,8 +94,10 @@
</span><span class="cx">
</span><span class="cx"> // Simply setting the containers and offsets directly would not do any of the checking
</span><span class="cx"> // that setStart and setEnd do, so we call those functions.
</span><del>- setStart(startContainer, startOffset);
- setEnd(endContainer, endOffset);
</del><ins>+ if (startContainer)
+ setStart(*startContainer, startOffset);
+ if (endContainer)
+ setEnd(*endContainer, endOffset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<Range> Range::create(Document& ownerDocument, PassRefPtr<Node> startContainer, int startOffset, PassRefPtr<Node> endContainer, int endOffset)
</span><span class="lines">@@ -129,8 +132,8 @@
</span><span class="cx"> ASSERT(m_ownerDocument.ptr() != &document);
</span><span class="cx"> m_ownerDocument->detachRange(this);
</span><span class="cx"> m_ownerDocument = document;
</span><del>- m_start.setToStartOfNode(&document);
- m_end.setToStartOfNode(&document);
</del><ins>+ m_start.setToStartOfNode(document);
+ m_end.setToStartOfNode(document);
</ins><span class="cx"> m_ownerDocument->attachRange(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -157,13 +160,8 @@
</span><span class="cx"> return startRootContainer != endRootContainer || (Range::compareBoundaryPoints(start, end, ASSERT_NO_EXCEPTION) > 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Range::setStart(PassRefPtr<Node> refNode, int offset, ExceptionCode& ec)
</del><ins>+void Range::setStart(Ref<Node>&& refNode, int offset, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!refNode) {
- ec = TypeError;
- return;
- }
-
</del><span class="cx"> bool didMoveDocument = false;
</span><span class="cx"> if (&refNode->document() != &ownerDocument()) {
</span><span class="cx"> setDocument(refNode->document());
</span><span class="lines">@@ -171,23 +169,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ec = 0;
</span><del>- Node* childNode = checkNodeWOffset(refNode.get(), offset, ec);
</del><ins>+ Node* childNode = checkNodeWOffset(refNode, offset, ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_start.set(refNode, offset, childNode);
</del><ins>+ m_start.set(WTFMove(refNode), offset, childNode);
</ins><span class="cx">
</span><span class="cx"> if (didMoveDocument || checkForDifferentRootContainer(m_start, m_end))
</span><span class="cx"> collapse(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Range::setEnd(PassRefPtr<Node> refNode, int offset, ExceptionCode& ec)
</del><ins>+void Range::setEnd(Ref<Node>&& refNode, int offset, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!refNode) {
- ec = TypeError;
- return;
- }
-
</del><span class="cx"> bool didMoveDocument = false;
</span><span class="cx"> if (&refNode->document() != &ownerDocument()) {
</span><span class="cx"> setDocument(refNode->document());
</span><span class="lines">@@ -195,11 +188,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ec = 0;
</span><del>- Node* childNode = checkNodeWOffset(refNode.get(), offset, ec);
</del><ins>+ Node* childNode = checkNodeWOffset(refNode, offset, ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_end.set(refNode, offset, childNode);
</del><ins>+ m_end.set(WTFMove(refNode), offset, childNode);
</ins><span class="cx">
</span><span class="cx"> if (didMoveDocument || checkForDifferentRootContainer(m_start, m_end))
</span><span class="cx"> collapse(false);
</span><span class="lines">@@ -208,13 +201,21 @@
</span><span class="cx"> void Range::setStart(const Position& start, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> Position parentAnchored = start.parentAnchoredEquivalent();
</span><del>- setStart(parentAnchored.containerNode(), parentAnchored.offsetInContainerNode(), ec);
</del><ins>+ if (!parentAnchored.containerNode()) {
+ ec = TypeError;
+ return;
+ }
+ setStart(*parentAnchored.containerNode(), parentAnchored.offsetInContainerNode(), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Range::setEnd(const Position& end, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> Position parentAnchored = end.parentAnchoredEquivalent();
</span><del>- setEnd(parentAnchored.containerNode(), parentAnchored.offsetInContainerNode(), ec);
</del><ins>+ if (!parentAnchored.containerNode()) {
+ ec = TypeError;
+ return;
+ }
+ setEnd(*parentAnchored.containerNode(), parentAnchored.offsetInContainerNode(), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Range::collapse(bool toStart)
</span><span class="lines">@@ -225,46 +226,35 @@
</span><span class="cx"> m_start = m_end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Range::isPointInRange(Node* refNode, int offset, ExceptionCode& ec)
</del><ins>+bool Range::isPointInRange(Node& refNode, int offset, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!refNode) {
- ec = TypeError;
</del><ins>+ if (&refNode.document() != &ownerDocument()) {
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (&refNode->document() != &ownerDocument()) {
- return false;
- }
-
</del><span class="cx"> ec = 0;
</span><span class="cx"> checkNodeWOffset(refNode, offset, ec);
</span><span class="cx"> if (ec) {
</span><span class="cx"> // DOM4 spec requires us to check whether refNode and start container have the same root first
</span><span class="cx"> // but we do it in the reverse order to avoid O(n) operation here in common case.
</span><del>- if (!commonAncestorContainer(refNode, &startContainer()))
</del><ins>+ if (!commonAncestorContainer(&refNode, &startContainer()))
</ins><span class="cx"> ec = 0;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool result = compareBoundaryPoints(refNode, offset, &startContainer(), m_start.offset(), ec) >= 0 && !ec
- && compareBoundaryPoints(refNode, offset, &endContainer(), m_end.offset(), ec) <= 0 && !ec;
</del><ins>+ bool result = compareBoundaryPoints(&refNode, offset, &startContainer(), m_start.offset(), ec) >= 0 && !ec
+ && compareBoundaryPoints(&refNode, offset, &endContainer(), m_end.offset(), ec) <= 0 && !ec;
</ins><span class="cx"> ASSERT(!ec || ec == WRONG_DOCUMENT_ERR);
</span><span class="cx"> ec = 0;
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-short Range::comparePoint(Node* refNode, int offset, ExceptionCode& ec) const
</del><ins>+short Range::comparePoint(Node& refNode, int offset, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> // http://developer.mozilla.org/en/docs/DOM:range.comparePoint
</span><span class="cx"> // This method returns -1, 0 or 1 depending on if the point described by the
</span><span class="cx"> // refNode node and an offset within the node is before, same as, or after the range respectively.
</span><del>-
- if (!refNode) {
- ec = TypeError;
- return 0;
- }
-
- if (&refNode->document() != &ownerDocument()) {
</del><ins>+ if (&refNode.document() != &ownerDocument()) {
</ins><span class="cx"> ec = WRONG_DOCUMENT_ERR;
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -274,49 +264,44 @@
</span><span class="cx"> if (ec) {
</span><span class="cx"> // DOM4 spec requires us to check whether refNode and start container have the same root first
</span><span class="cx"> // but we do it in the reverse order to avoid O(n) operation here in common case.
</span><del>- if (!refNode->inDocument() && !commonAncestorContainer(refNode, &startContainer()))
</del><ins>+ if (!refNode.inDocument() && !commonAncestorContainer(&refNode, &startContainer()))
</ins><span class="cx"> ec = WRONG_DOCUMENT_ERR;
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // compare to start, and point comes before
</span><del>- if (compareBoundaryPoints(refNode, offset, &startContainer(), m_start.offset(), ec) < 0)
</del><ins>+ if (compareBoundaryPoints(&refNode, offset, &startContainer(), m_start.offset(), ec) < 0)
</ins><span class="cx"> return -1;
</span><span class="cx">
</span><span class="cx"> if (ec)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // compare to end, and point comes after
</span><del>- if (compareBoundaryPoints(refNode, offset, &endContainer(), m_end.offset(), ec) > 0 && !ec)
</del><ins>+ if (compareBoundaryPoints(&refNode, offset, &endContainer(), m_end.offset(), ec) > 0 && !ec)
</ins><span class="cx"> return 1;
</span><span class="cx">
</span><span class="cx"> // point is in the middle of this range, or on the boundary points
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Range::CompareResults Range::compareNode(Node* refNode, ExceptionCode& ec) const
</del><ins>+Range::CompareResults Range::compareNode(Node& refNode, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> // http://developer.mozilla.org/en/docs/DOM:range.compareNode
</span><span class="cx"> // This method returns 0, 1, 2, or 3 based on if the node is before, after,
</span><span class="cx"> // before and after(surrounds), or inside the range, respectively
</span><span class="cx">
</span><del>- if (!refNode) {
- ec = TypeError;
- return NODE_BEFORE;
- }
-
- if (!refNode->inDocument()) {
</del><ins>+ if (!refNode.inDocument()) {
</ins><span class="cx"> // Firefox doesn't throw an exception for this case; it returns 0.
</span><span class="cx"> return NODE_BEFORE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (&refNode->document() != &ownerDocument()) {
</del><ins>+ if (&refNode.document() != &ownerDocument()) {
</ins><span class="cx"> // Firefox doesn't throw an exception for this case; it returns 0.
</span><span class="cx"> return NODE_BEFORE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ContainerNode* parentNode = refNode->parentNode();
- unsigned nodeIndex = refNode->computeNodeIndex();
</del><ins>+ ContainerNode* parentNode = refNode.parentNode();
+ unsigned nodeIndex = refNode.computeNodeIndex();
</ins><span class="cx">
</span><span class="cx"> if (!parentNode) {
</span><span class="cx"> // if the node is the top document we should return NODE_BEFORE_AND_AFTER
</span><span class="lines">@@ -325,26 +310,22 @@
</span><span class="cx"> return NODE_BEFORE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (comparePoint(parentNode, nodeIndex, ec) < 0) { // starts before
- if (comparePoint(parentNode, nodeIndex + 1, ec) > 0) // ends after the range
</del><ins>+ // starts before
+ if (comparePoint(*parentNode, nodeIndex, ec) < 0) {
+ if (comparePoint(*parentNode, nodeIndex + 1, ec) > 0) // ends after the range
</ins><span class="cx"> return NODE_BEFORE_AND_AFTER;
</span><span class="cx"> return NODE_BEFORE; // ends before or in the range
</span><del>- } else { // starts at or after the range start
- if (comparePoint(parentNode, nodeIndex + 1, ec) > 0) // ends after the range
- return NODE_AFTER;
- return NODE_INSIDE; // ends inside the range
</del><span class="cx"> }
</span><ins>+ // starts at or after the range start
+ if (comparePoint(*parentNode, nodeIndex + 1, ec) > 0) // ends after the range
+ return NODE_AFTER;
+ return NODE_INSIDE; // ends inside the range
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-short Range::compareBoundaryPoints(CompareHow how, const Range* sourceRange, ExceptionCode& ec) const
</del><ins>+short Range::compareBoundaryPoints(CompareHow how, const Range& sourceRange, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><del>- if (!sourceRange) {
- ec = TypeError;
- return 0;
- }
-
</del><span class="cx"> Node* thisCont = commonAncestorContainer();
</span><del>- Node* sourceCont = sourceRange->commonAncestorContainer();
</del><ins>+ Node* sourceCont = sourceRange.commonAncestorContainer();
</ins><span class="cx">
</span><span class="cx"> if (&thisCont->document() != &sourceCont->document()) {
</span><span class="cx"> ec = WRONG_DOCUMENT_ERR;
</span><span class="lines">@@ -364,20 +345,20 @@
</span><span class="cx">
</span><span class="cx"> switch (how) {
</span><span class="cx"> case START_TO_START:
</span><del>- return compareBoundaryPoints(m_start, sourceRange->m_start, ec);
</del><ins>+ return compareBoundaryPoints(m_start, sourceRange.m_start, ec);
</ins><span class="cx"> case START_TO_END:
</span><del>- return compareBoundaryPoints(m_end, sourceRange->m_start, ec);
</del><ins>+ return compareBoundaryPoints(m_end, sourceRange.m_start, ec);
</ins><span class="cx"> case END_TO_END:
</span><del>- return compareBoundaryPoints(m_end, sourceRange->m_end, ec);
</del><ins>+ return compareBoundaryPoints(m_end, sourceRange.m_end, ec);
</ins><span class="cx"> case END_TO_START:
</span><del>- return compareBoundaryPoints(m_start, sourceRange->m_end, ec);
</del><ins>+ return compareBoundaryPoints(m_start, sourceRange.m_end, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-short Range::compareBoundaryPointsForBindings(unsigned short compareHow, const Range* sourceRange, ExceptionCode& ec) const
</del><ins>+short Range::compareBoundaryPointsForBindings(unsigned short compareHow, const Range& sourceRange, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> if (compareHow > END_TO_START) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="lines">@@ -495,26 +476,21 @@
</span><span class="cx"> processContents(Delete, ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Range::intersectsNode(Node* refNode, ExceptionCode& ec) const
</del><ins>+bool Range::intersectsNode(Node& refNode, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><del>- if (!refNode) {
- ec = TypeError;
</del><ins>+ if (!refNode.inDocument() || &refNode.document() != &ownerDocument())
</ins><span class="cx"> return false;
</span><del>- }
</del><span class="cx">
</span><del>- if (!refNode->inDocument() || &refNode->document() != &ownerDocument())
- return false;
-
- ContainerNode* parentNode = refNode->parentNode();
</del><ins>+ ContainerNode* parentNode = refNode.parentNode();
</ins><span class="cx"> if (!parentNode)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- unsigned nodeIndex = refNode->computeNodeIndex();
</del><ins>+ unsigned nodeIndex = refNode.computeNodeIndex();
</ins><span class="cx">
</span><span class="cx"> // If (parent, offset) is before end and (parent, offset + 1) is after start, return true.
</span><span class="cx"> // Otherwise, return false.
</span><del>- short compareFirst = comparePoint(parentNode, nodeIndex, ec);
- short compareSecond = comparePoint(parentNode, nodeIndex + 1, ec);
</del><ins>+ short compareFirst = comparePoint(*parentNode, nodeIndex, ec);
+ short compareSecond = comparePoint(*parentNode, nodeIndex + 1, ec);
</ins><span class="cx">
</span><span class="cx"> bool isFirstBeforeEnd = m_start == m_end ? compareFirst < 0 : compareFirst <= 0;
</span><span class="cx"> bool isSecondAfterStart = m_start == m_end ? compareSecond > 0 : compareSecond >= 0;
</span><span class="lines">@@ -645,9 +621,9 @@
</span><span class="cx"> ec = 0;
</span><span class="cx"> if (action == Extract || action == Delete) {
</span><span class="cx"> if (partialStart && commonRoot->contains(partialStart.get()))
</span><del>- setStart(partialStart->parentNode(), partialStart->computeNodeIndex() + 1, ec);
</del><ins>+ setStart(*partialStart->parentNode(), partialStart->computeNodeIndex() + 1, ec);
</ins><span class="cx"> else if (partialEnd && commonRoot->contains(partialEnd.get()))
</span><del>- setStart(partialEnd->parentNode(), partialEnd->computeNodeIndex(), ec);
</del><ins>+ setStart(*partialEnd->parentNode(), partialEnd->computeNodeIndex(), ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return nullptr;
</span><span class="cx"> m_end = m_start;
</span><span class="lines">@@ -836,13 +812,8 @@
</span><span class="cx"> return processContents(Clone, ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Range::insertNode(RefPtr<Node>&& node, ExceptionCode& ec)
</del><ins>+void Range::insertNode(Ref<Node>&& node, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!node) {
- ec = TypeError;
- return;
- }
-
</del><span class="cx"> bool startIsCharacterData = is<CharacterData>(startContainer());
</span><span class="cx"> if (startIsCharacterData && !startContainer().parentNode()) {
</span><span class="cx"> ec = HIERARCHY_REQUEST_ERR;
</span><span class="lines">@@ -859,7 +830,7 @@
</span><span class="cx"> Ref<ContainerNode> parent = downcast<ContainerNode>(*parentNode);
</span><span class="cx">
</span><span class="cx"> ec = 0;
</span><del>- if (!parent->ensurePreInsertionValidity(*node, referenceNode.get(), ec))
</del><ins>+ if (!parent->ensurePreInsertionValidity(node, referenceNode.get(), ec))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> EventQueueScope scope;
</span><span class="lines">@@ -869,7 +840,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (referenceNode == node)
</del><ins>+ if (referenceNode == node.ptr())
</ins><span class="cx"> referenceNode = referenceNode->nextSibling();
</span><span class="cx">
</span><span class="cx"> node->remove(ec);
</span><span class="lines">@@ -877,17 +848,17 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> unsigned newOffset = referenceNode ? referenceNode->computeNodeIndex() : parent->countChildNodes();
</span><del>- if (is<DocumentFragment>(*node))
- newOffset += downcast<DocumentFragment>(*node).countChildNodes();
</del><ins>+ if (is<DocumentFragment>(node.get()))
+ newOffset += downcast<DocumentFragment>(node.get()).countChildNodes();
</ins><span class="cx"> else
</span><span class="cx"> ++newOffset;
</span><span class="cx">
</span><del>- parent->insertBefore(node.releaseNonNull(), referenceNode.get(), ec);
</del><ins>+ parent->insertBefore(WTFMove(node), referenceNode.get(), ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (collapsed())
</span><del>- setEnd(parent.ptr(), newOffset, ec);
</del><ins>+ setEnd(WTFMove(parent), newOffset, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Range::toString() const
</span><span class="lines">@@ -950,9 +921,9 @@
</span><span class="cx"> // This is now a no-op as per the DOM specification.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node* Range::checkNodeWOffset(Node* n, int offset, ExceptionCode& ec) const
</del><ins>+Node* Range::checkNodeWOffset(Node& node, int offset, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><del>- switch (n->nodeType()) {
</del><ins>+ switch (node.nodeType()) {
</ins><span class="cx"> case Node::DOCUMENT_TYPE_NODE:
</span><span class="cx"> ec = INVALID_NODE_TYPE_ERR;
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -960,7 +931,7 @@
</span><span class="cx"> case Node::COMMENT_NODE:
</span><span class="cx"> case Node::TEXT_NODE:
</span><span class="cx"> case Node::PROCESSING_INSTRUCTION_NODE:
</span><del>- if (static_cast<unsigned>(offset) > downcast<CharacterData>(*n).length())
</del><ins>+ if (static_cast<unsigned>(offset) > downcast<CharacterData>(node).length())
</ins><span class="cx"> ec = INDEX_SIZE_ERR;
</span><span class="cx"> return nullptr;
</span><span class="cx"> case Node::ATTRIBUTE_NODE:
</span><span class="lines">@@ -969,7 +940,7 @@
</span><span class="cx"> case Node::ELEMENT_NODE: {
</span><span class="cx"> if (!offset)
</span><span class="cx"> return nullptr;
</span><del>- Node* childBefore = n->traverseToChildAt(offset - 1);
</del><ins>+ Node* childBefore = node.traverseToChildAt(offset - 1);
</ins><span class="cx"> if (!childBefore)
</span><span class="cx"> ec = INDEX_SIZE_ERR;
</span><span class="cx"> return childBefore;
</span><span class="lines">@@ -984,102 +955,72 @@
</span><span class="cx"> return Range::create(ownerDocument(), &startContainer(), m_start.offset(), &endContainer(), m_end.offset());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Range::setStartAfter(Node* refNode, ExceptionCode& ec)
</del><ins>+void Range::setStartAfter(Node& refNode, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!refNode) {
- ec = TypeError;
- return;
- }
-
- if (!refNode->parentNode()) {
</del><ins>+ if (!refNode.parentNode()) {
</ins><span class="cx"> ec = INVALID_NODE_TYPE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setStart(refNode->parentNode(), refNode->computeNodeIndex() + 1, ec);
</del><ins>+ setStart(*refNode.parentNode(), refNode.computeNodeIndex() + 1, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Range::setEndBefore(Node* refNode, ExceptionCode& ec)
</del><ins>+void Range::setEndBefore(Node& refNode, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!refNode) {
- ec = TypeError;
- return;
- }
-
- if (!refNode->parentNode()) {
</del><ins>+ if (!refNode.parentNode()) {
</ins><span class="cx"> ec = INVALID_NODE_TYPE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setEnd(refNode->parentNode(), refNode->computeNodeIndex(), ec);
</del><ins>+ setEnd(*refNode.parentNode(), refNode.computeNodeIndex(), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Range::setEndAfter(Node* refNode, ExceptionCode& ec)
</del><ins>+void Range::setEndAfter(Node& refNode, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!refNode) {
- ec = TypeError;
- return;
- }
-
- if (!refNode->parentNode()) {
</del><ins>+ if (!refNode.parentNode()) {
</ins><span class="cx"> ec = INVALID_NODE_TYPE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setEnd(refNode->parentNode(), refNode->computeNodeIndex() + 1, ec);
</del><ins>+ setEnd(*refNode.parentNode(), refNode.computeNodeIndex() + 1, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Range::selectNode(Node* refNode, ExceptionCode& ec)
</del><ins>+void Range::selectNode(Node& refNode, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!refNode) {
- ec = TypeError;
- return;
- }
-
- if (!refNode->parentNode()) {
</del><ins>+ if (!refNode.parentNode()) {
</ins><span class="cx"> ec = INVALID_NODE_TYPE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (&ownerDocument() != &refNode->document())
- setDocument(refNode->document());
</del><ins>+ if (&ownerDocument() != &refNode.document())
+ setDocument(refNode.document());
</ins><span class="cx">
</span><del>- unsigned index = refNode->computeNodeIndex();
</del><ins>+ unsigned index = refNode.computeNodeIndex();
</ins><span class="cx"> ec = 0;
</span><del>- setStart(refNode->parentNode(), index, ec);
</del><ins>+ setStart(*refNode.parentNode(), index, ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><del>- setEnd(refNode->parentNode(), index + 1, ec);
</del><ins>+ setEnd(*refNode.parentNode(), index + 1, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Range::selectNodeContents(Node* refNode, ExceptionCode& ec)
</del><ins>+void Range::selectNodeContents(Node& refNode, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!refNode) {
- ec = TypeError;
- return;
- }
-
- if (refNode->isDocumentTypeNode()) {
</del><ins>+ if (refNode.isDocumentTypeNode()) {
</ins><span class="cx"> ec = INVALID_NODE_TYPE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (&ownerDocument() != &refNode->document())
- setDocument(refNode->document());
</del><ins>+ if (&ownerDocument() != &refNode.document())
+ setDocument(refNode.document());
</ins><span class="cx">
</span><span class="cx"> m_start.setToStartOfNode(refNode);
</span><span class="cx"> m_end.setToEndOfNode(refNode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Range::surroundContents(PassRefPtr<Node> passNewParent, ExceptionCode& ec)
</del><ins>+void Range::surroundContents(Node& passNewParent, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- RefPtr<Node> newParent = passNewParent;
</del><ins>+ Ref<Node> newParent = passNewParent;
</ins><span class="cx">
</span><del>- if (!newParent) {
- ec = TypeError;
- return;
- }
-
</del><span class="cx"> // INVALID_STATE_ERR: Raised if the Range partially selects a non-Text node.
</span><span class="cx"> // https://dom.spec.whatwg.org/#dom-range-surroundcontents (step 1).
</span><span class="cx"> Node* startNonTextContainer = &startContainer();
</span><span class="lines">@@ -1133,7 +1074,7 @@
</span><span class="cx">
</span><span class="cx"> ec = 0;
</span><span class="cx"> while (Node* n = newParent->firstChild()) {
</span><del>- downcast<ContainerNode>(*newParent).removeChild(*n, ec);
</del><ins>+ downcast<ContainerNode>(newParent.get()).removeChild(*n, ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1146,22 +1087,17 @@
</span><span class="cx"> newParent->appendChild(fragment.release(), ec);
</span><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><del>- selectNode(newParent.get(), ec);
</del><ins>+ selectNode(newParent, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Range::setStartBefore(Node* refNode, ExceptionCode& ec)
</del><ins>+void Range::setStartBefore(Node& refNode, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!refNode) {
- ec = TypeError;
- return;
- }
-
- if (!refNode->parentNode()) {
</del><ins>+ if (!refNode.parentNode()) {
</ins><span class="cx"> ec = INVALID_NODE_TYPE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setStart(refNode->parentNode(), refNode->computeNodeIndex(), ec);
</del><ins>+ setStart(*refNode.parentNode(), refNode.computeNodeIndex(), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* Range::firstNode() const
</span><span class="lines">@@ -1539,11 +1475,11 @@
</span><span class="cx"> if (commonAncestorContainer()->ownerDocument() != other.commonAncestorContainer()->ownerDocument())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- short startToStart = compareBoundaryPoints(Range::START_TO_START, &other, ASSERT_NO_EXCEPTION);
</del><ins>+ short startToStart = compareBoundaryPoints(Range::START_TO_START, other, ASSERT_NO_EXCEPTION);
</ins><span class="cx"> if (startToStart > 0)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- short endToEnd = compareBoundaryPoints(Range::END_TO_END, &other, ASSERT_NO_EXCEPTION);
</del><ins>+ short endToEnd = compareBoundaryPoints(Range::END_TO_END, other, ASSERT_NO_EXCEPTION);
</ins><span class="cx"> return endToEnd >= 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1575,19 +1511,19 @@
</span><span class="cx"> if (a->commonAncestorContainer()->ownerDocument() != b->commonAncestorContainer()->ownerDocument())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- short startToStart = a->compareBoundaryPoints(Range::START_TO_START, b, ASSERT_NO_EXCEPTION);
- short endToEnd = a->compareBoundaryPoints(Range::END_TO_END, b, ASSERT_NO_EXCEPTION);
</del><ins>+ short startToStart = a->compareBoundaryPoints(Range::START_TO_START, *b, ASSERT_NO_EXCEPTION);
+ short endToEnd = a->compareBoundaryPoints(Range::END_TO_END, *b, ASSERT_NO_EXCEPTION);
</ins><span class="cx">
</span><span class="cx"> // First range contains the second range.
</span><span class="cx"> if (startToStart <= 0 && endToEnd >= 0)
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // End of first range is inside second range.
</span><del>- if (a->compareBoundaryPoints(Range::START_TO_END, b, ASSERT_NO_EXCEPTION) >= 0 && endToEnd <= 0)
</del><ins>+ if (a->compareBoundaryPoints(Range::START_TO_END, *b, ASSERT_NO_EXCEPTION) >= 0 && endToEnd <= 0)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Start of first range is inside second range.
</span><del>- if (startToStart >= 0 && a->compareBoundaryPoints(Range::END_TO_START, b, ASSERT_NO_EXCEPTION) <= 0)
</del><ins>+ if (startToStart >= 0 && a->compareBoundaryPoints(Range::END_TO_START, *b, ASSERT_NO_EXCEPTION) <= 0)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1597,7 +1533,7 @@
</span><span class="cx"> {
</span><span class="cx"> Ref<Range> range = Range::create(node.document());
</span><span class="cx"> int exception = 0;
</span><del>- range->selectNodeContents(&node, exception);
</del><ins>+ range->selectNodeContents(node, exception);
</ins><span class="cx"> return range;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1621,13 +1557,13 @@
</span><span class="cx"> {
</span><span class="cx"> for (Node* nodeToBeRemoved = container.firstChild(); nodeToBeRemoved; nodeToBeRemoved = nodeToBeRemoved->nextSibling()) {
</span><span class="cx"> if (boundary.childBefore() == nodeToBeRemoved) {
</span><del>- boundary.setToStartOfNode(&container);
</del><ins>+ boundary.setToStartOfNode(container);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (Node* n = boundary.container(); n; n = n->parentNode()) {
</span><span class="cx"> if (n == nodeToBeRemoved) {
</span><del>- boundary.setToStartOfNode(&container);
</del><ins>+ boundary.setToStartOfNode(container);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1707,9 +1643,9 @@
</span><span class="cx"> static inline void boundaryTextNodesMerged(RangeBoundaryPoint& boundary, NodeWithIndex& oldNode, unsigned offset)
</span><span class="cx"> {
</span><span class="cx"> if (boundary.container() == oldNode.node())
</span><del>- boundary.set(oldNode.node()->previousSibling(), boundary.offset() + offset, 0);
</del><ins>+ boundary.set(*oldNode.node()->previousSibling(), boundary.offset() + offset, 0);
</ins><span class="cx"> else if (boundary.container() == oldNode.node()->parentNode() && boundary.offset() == oldNode.index())
</span><del>- boundary.set(oldNode.node()->previousSibling(), offset, 0);
</del><ins>+ boundary.set(*oldNode.node()->previousSibling(), offset, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Range::textNodesMerged(NodeWithIndex& oldNode, unsigned offset)
</span><span class="lines">@@ -1730,7 +1666,7 @@
</span><span class="cx"> unsigned splitOffset = oldNode->length();
</span><span class="cx"> unsigned boundaryOffset = boundary.offset();
</span><span class="cx"> if (boundaryOffset > splitOffset)
</span><del>- boundary.set(oldNode->nextSibling(), boundaryOffset - splitOffset, 0);
</del><ins>+ boundary.set(*oldNode->nextSibling(), boundaryOffset - splitOffset, 0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> auto* parent = oldNode->parentNode();
</span><span class="lines">@@ -1771,8 +1707,17 @@
</span><span class="cx"> end = endOfDocument(end);
</span><span class="cx"> } else
</span><span class="cx"> return;
</span><del>- setStart(start.deepEquivalent().containerNode(), start.deepEquivalent().computeOffsetInContainerNode(), ec);
- setEnd(end.deepEquivalent().containerNode(), end.deepEquivalent().computeOffsetInContainerNode(), ec);
</del><ins>+
+ if (!start.deepEquivalent().containerNode()) {
+ ec = TypeError;
+ return;
+ }
+ setStart(*start.deepEquivalent().containerNode(), start.deepEquivalent().computeOffsetInContainerNode(), ec);
+ if (!end.deepEquivalent().containerNode()) {
+ ec = TypeError;
+ return;
+ }
+ setEnd(*end.deepEquivalent().containerNode(), end.deepEquivalent().computeOffsetInContainerNode(), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<ClientRectList> Range::getClientRects() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/dom/Range.h 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -66,24 +66,24 @@
</span><span class="cx">
</span><span class="cx"> Node* commonAncestorContainer() const { return commonAncestorContainer(&startContainer(), &endContainer()); }
</span><span class="cx"> WEBCORE_EXPORT static Node* commonAncestorContainer(Node* containerA, Node* containerB);
</span><del>- WEBCORE_EXPORT void setStart(PassRefPtr<Node> container, int offset, ExceptionCode& = ASSERT_NO_EXCEPTION);
- WEBCORE_EXPORT void setEnd(PassRefPtr<Node> container, int offset, ExceptionCode& = ASSERT_NO_EXCEPTION);
</del><ins>+ WEBCORE_EXPORT void setStart(Ref<Node>&& container, int offset, ExceptionCode& = ASSERT_NO_EXCEPTION);
+ WEBCORE_EXPORT void setEnd(Ref<Node>&& container, int offset, ExceptionCode& = ASSERT_NO_EXCEPTION);
</ins><span class="cx"> WEBCORE_EXPORT void collapse(bool toStart);
</span><del>- WEBCORE_EXPORT bool isPointInRange(Node* refNode, int offset, ExceptionCode&);
- short comparePoint(Node* refNode, int offset, ExceptionCode&) const;
</del><ins>+ WEBCORE_EXPORT bool isPointInRange(Node& refNode, int offset, ExceptionCode&);
+ short comparePoint(Node& refNode, int offset, ExceptionCode&) const;
</ins><span class="cx"> enum CompareResults { NODE_BEFORE, NODE_AFTER, NODE_BEFORE_AND_AFTER, NODE_INSIDE };
</span><del>- CompareResults compareNode(Node* refNode, ExceptionCode&) const;
</del><ins>+ CompareResults compareNode(Node& refNode, ExceptionCode&) const;
</ins><span class="cx"> enum CompareHow { START_TO_START, START_TO_END, END_TO_END, END_TO_START };
</span><del>- WEBCORE_EXPORT short compareBoundaryPoints(CompareHow, const Range* sourceRange, ExceptionCode&) const;
- short compareBoundaryPointsForBindings(unsigned short compareHow, const Range* sourceRange, ExceptionCode&) const;
</del><ins>+ WEBCORE_EXPORT short compareBoundaryPoints(CompareHow, const Range& sourceRange, ExceptionCode&) const;
+ short compareBoundaryPointsForBindings(unsigned short compareHow, const Range& sourceRange, ExceptionCode&) const;
</ins><span class="cx"> static short compareBoundaryPoints(Node* containerA, int offsetA, Node* containerB, int offsetB, ExceptionCode&);
</span><span class="cx"> static short compareBoundaryPoints(const RangeBoundaryPoint& boundaryA, const RangeBoundaryPoint& boundaryB, ExceptionCode&);
</span><span class="cx"> WEBCORE_EXPORT bool boundaryPointsValid() const;
</span><del>- bool intersectsNode(Node* refNode, ExceptionCode&) const;
</del><ins>+ bool intersectsNode(Node& refNode, ExceptionCode&) const;
</ins><span class="cx"> void deleteContents(ExceptionCode&);
</span><span class="cx"> RefPtr<DocumentFragment> extractContents(ExceptionCode&);
</span><span class="cx"> RefPtr<DocumentFragment> cloneContents(ExceptionCode&);
</span><del>- void insertNode(RefPtr<Node>&&, ExceptionCode&);
</del><ins>+ void insertNode(Ref<Node>&&, ExceptionCode&);
</ins><span class="cx"> String toString() const;
</span><span class="cx">
</span><span class="cx"> String toHTML() const;
</span><span class="lines">@@ -94,13 +94,13 @@
</span><span class="cx"> void detach();
</span><span class="cx"> WEBCORE_EXPORT Ref<Range> cloneRange() const;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setStartAfter(Node*, ExceptionCode& = ASSERT_NO_EXCEPTION);
- WEBCORE_EXPORT void setEndBefore(Node*, ExceptionCode& = ASSERT_NO_EXCEPTION);
- WEBCORE_EXPORT void setEndAfter(Node*, ExceptionCode& = ASSERT_NO_EXCEPTION);
- WEBCORE_EXPORT void selectNode(Node*, ExceptionCode& = ASSERT_NO_EXCEPTION);
- WEBCORE_EXPORT void selectNodeContents(Node*, ExceptionCode&);
- void surroundContents(PassRefPtr<Node>, ExceptionCode&);
- WEBCORE_EXPORT void setStartBefore(Node*, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT void setStartAfter(Node&, ExceptionCode& = ASSERT_NO_EXCEPTION);
+ WEBCORE_EXPORT void setEndBefore(Node&, ExceptionCode& = ASSERT_NO_EXCEPTION);
+ WEBCORE_EXPORT void setEndAfter(Node&, ExceptionCode& = ASSERT_NO_EXCEPTION);
+ WEBCORE_EXPORT void selectNode(Node&, ExceptionCode& = ASSERT_NO_EXCEPTION);
+ WEBCORE_EXPORT void selectNodeContents(Node&, ExceptionCode&);
+ void surroundContents(Node&, ExceptionCode&);
+ WEBCORE_EXPORT void setStartBefore(Node&, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> const Position startPosition() const { return m_start.toPosition(); }
</span><span class="cx"> const Position endPosition() const { return m_end.toPosition(); }
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx">
</span><span class="cx"> void setDocument(Document&);
</span><span class="cx">
</span><del>- Node* checkNodeWOffset(Node*, int offset, ExceptionCode&) const;
</del><ins>+ Node* checkNodeWOffset(Node&, int offset, ExceptionCode&) const;
</ins><span class="cx">
</span><span class="cx"> enum ActionType { Delete, Extract, Clone };
</span><span class="cx"> RefPtr<DocumentFragment> processContents(ActionType, ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.idl (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.idl 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/dom/Range.idl 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> [
</span><span class="cx"> Constructor,
</span><span class="cx"> ConstructorCallWith=Document,
</span><del>- UsePointersEvenForNonNullableObjectArguments,
</del><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ExportMacro=WEBCORE_EXPORT,
</span><span class="cx"> ] interface Range {
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeBoundaryPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/RangeBoundaryPoint.h (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/RangeBoundaryPoint.h 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/dom/RangeBoundaryPoint.h 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -45,13 +45,13 @@
</span><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span><del>- void set(PassRefPtr<Node> container, int offset, Node* childBefore);
</del><ins>+ void set(Ref<Node>&& container, int offset, Node* childBefore);
</ins><span class="cx"> void setOffset(int offset);
</span><span class="cx">
</span><span class="cx"> void setToBeforeChild(Node&);
</span><span class="cx"> void setToAfterChild(Node&);
</span><del>- void setToStartOfNode(PassRefPtr<Node>);
- void setToEndOfNode(PassRefPtr<Node>);
</del><ins>+ void setToStartOfNode(Ref<Node>&&);
+ void setToEndOfNode(Ref<Node>&&);
</ins><span class="cx">
</span><span class="cx"> void childBeforeWillBeRemoved();
</span><span class="cx"> void invalidateOffset() const;
</span><span class="lines">@@ -116,12 +116,11 @@
</span><span class="cx"> m_childBeforeBoundary = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void RangeBoundaryPoint::set(PassRefPtr<Node> container, int offset, Node* childBefore)
</del><ins>+inline void RangeBoundaryPoint::set(Ref<Node>&& container, int offset, Node* childBefore)
</ins><span class="cx"> {
</span><del>- ASSERT(container);
</del><span class="cx"> ASSERT(offset >= 0);
</span><span class="cx"> ASSERT(childBefore == (offset ? container->traverseToChildAt(offset - 1) : 0));
</span><del>- m_containerNode = container;
</del><ins>+ m_containerNode = WTFMove(container);
</ins><span class="cx"> m_offsetInContainer = offset;
</span><span class="cx"> m_childBeforeBoundary = childBefore;
</span><span class="cx"> }
</span><span class="lines">@@ -151,18 +150,16 @@
</span><span class="cx"> m_offsetInContainer = m_childBeforeBoundary ? invalidOffset : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void RangeBoundaryPoint::setToStartOfNode(PassRefPtr<Node> container)
</del><ins>+inline void RangeBoundaryPoint::setToStartOfNode(Ref<Node>&& container)
</ins><span class="cx"> {
</span><del>- ASSERT(container);
- m_containerNode = container;
</del><ins>+ m_containerNode = WTFMove(container);
</ins><span class="cx"> m_offsetInContainer = 0;
</span><span class="cx"> m_childBeforeBoundary = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void RangeBoundaryPoint::setToEndOfNode(PassRefPtr<Node> container)
</del><ins>+inline void RangeBoundaryPoint::setToEndOfNode(Ref<Node>&& container)
</ins><span class="cx"> {
</span><del>- ASSERT(container);
- m_containerNode = container;
</del><ins>+ m_containerNode = WTFMove(container);
</ins><span class="cx"> if (m_containerNode->offsetInCharacters()) {
</span><span class="cx"> m_offsetInContainer = m_containerNode->maxCharacterOffset();
</span><span class="cx"> m_childBeforeBoundary = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingAlternativeTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/AlternativeTextController.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/AlternativeTextController.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/AlternativeTextController.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -258,7 +258,9 @@
</span><span class="cx">
</span><span class="cx"> Position startPositionOfRangeWithAlternative = range->startPosition();
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- correctionStartOffsetInParagraphAsRange->setEnd(startPositionOfRangeWithAlternative.containerNode(), startPositionOfRangeWithAlternative.computeOffsetInContainerNode(), ec);
</del><ins>+ if (!startPositionOfRangeWithAlternative.containerNode())
+ return;
+ correctionStartOffsetInParagraphAsRange->setEnd(*startPositionOfRangeWithAlternative.containerNode(), startPositionOfRangeWithAlternative.computeOffsetInContainerNode(), ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyStyleCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -722,7 +722,7 @@
</span><span class="cx"> RefPtr<Range> range = Range::create(startNode->document(), start, end);
</span><span class="cx"> Element* editableRoot = startNode->rootEditableElement();
</span><span class="cx"> if (startNode != editableRoot) {
</span><del>- while (editableRoot && startNode->parentNode() != editableRoot && isNodeVisiblyContainedWithin(startNode->parentNode(), range.get()))
</del><ins>+ while (editableRoot && startNode->parentNode() != editableRoot && isNodeVisiblyContainedWithin(*startNode->parentNode(), range.get()))
</ins><span class="cx"> startNode = startNode->parentNode();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec;
</span><span class="cx"> RefPtr<Range> context = document().createRange();
</span><del>- context->selectNodeContents(&element, ec);
</del><ins>+ context->selectNodeContents(element, ec);
</ins><span class="cx">
</span><span class="cx"> StringBuilder dictationPhrasesBuilder;
</span><span class="cx"> for (auto& interpretations : dictationPhrases)
</span><span class="lines">@@ -627,7 +627,7 @@
</span><span class="cx"> elem->remove(ec);
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> context = document().createRange();
</span><del>- context->selectNodeContents(elem, ec);
</del><ins>+ context->selectNodeContents(*elem, ec);
</ins><span class="cx"> Ref<DocumentFragment> fragment = createFragmentFromText(*context.get(), text);
</span><span class="cx"> elem->appendChild(WTFMove(fragment), ec);
</span><span class="cx">
</span><span class="lines">@@ -1950,14 +1950,16 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Position rangeCompliantPosition = position.parentAnchoredEquivalent();
</span><del>- spellingSearchRange->setStart(rangeCompliantPosition.deprecatedNode(), rangeCompliantPosition.deprecatedEditingOffset(), IGNORE_EXCEPTION);
</del><ins>+ if (rangeCompliantPosition.deprecatedNode())
+ spellingSearchRange->setStart(*rangeCompliantPosition.deprecatedNode(), rangeCompliantPosition.deprecatedEditingOffset(), IGNORE_EXCEPTION);
</ins><span class="cx"> startedWithSelection = false; // won't need to wrap
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // topNode defines the whole range we want to operate on
</span><span class="cx"> Node* topNode = highestEditableRoot(position);
</span><span class="cx"> // FIXME: lastOffsetForEditing() is wrong here if editingIgnoresContent(highestEditableRoot()) returns true (e.g. a <table>)
</span><del>- spellingSearchRange->setEnd(topNode, lastOffsetForEditing(topNode), IGNORE_EXCEPTION);
</del><ins>+ if (topNode)
+ spellingSearchRange->setEnd(*topNode, lastOffsetForEditing(topNode), IGNORE_EXCEPTION);
</ins><span class="cx">
</span><span class="cx"> // If spellingSearchRange starts in the middle of a word, advance to the next word so we start checking
</span><span class="cx"> // at a word boundary. Going back by one char and then forward by a word does the trick.
</span><span class="lines">@@ -2011,7 +2013,7 @@
</span><span class="cx"> // Stop looking at start of next misspelled word
</span><span class="cx"> CharacterIterator chars(*grammarSearchRange);
</span><span class="cx"> chars.advance(misspellingOffset);
</span><del>- grammarSearchRange->setEnd(&chars.range()->startContainer(), chars.range()->startOffset(), IGNORE_EXCEPTION);
</del><ins>+ grammarSearchRange->setEnd(chars.range()->startContainer(), chars.range()->startOffset(), IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isGrammarCheckingEnabled())
</span><span class="lines">@@ -2022,9 +2024,10 @@
</span><span class="cx"> // If we found neither bad grammar nor a misspelled word, wrap and try again (but don't bother if we started at the beginning of the
</span><span class="cx"> // block rather than at a selection).
</span><span class="cx"> if (startedWithSelection && !misspelledWord && !badGrammarPhrase) {
</span><del>- spellingSearchRange->setStart(topNode, 0, IGNORE_EXCEPTION);
</del><ins>+ if (topNode)
+ spellingSearchRange->setStart(*topNode, 0, IGNORE_EXCEPTION);
</ins><span class="cx"> // going until the end of the very first chunk we tested is far enough
</span><del>- spellingSearchRange->setEnd(&searchEndNodeAfterWrap, searchEndOffsetAfterWrap, IGNORE_EXCEPTION);
</del><ins>+ spellingSearchRange->setEnd(searchEndNodeAfterWrap, searchEndOffsetAfterWrap, IGNORE_EXCEPTION);
</ins><span class="cx">
</span><span class="cx"> if (unifiedTextCheckerEnabled()) {
</span><span class="cx"> grammarSearchRange = spellingSearchRange->cloneRange();
</span><span class="lines">@@ -2045,7 +2048,7 @@
</span><span class="cx"> // Stop looking at start of next misspelled word
</span><span class="cx"> CharacterIterator chars(*grammarSearchRange);
</span><span class="cx"> chars.advance(misspellingOffset);
</span><del>- grammarSearchRange->setEnd(&chars.range()->startContainer(), chars.range()->startOffset(), IGNORE_EXCEPTION);
</del><ins>+ grammarSearchRange->setEnd(chars.range()->startContainer(), chars.range()->startOffset(), IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isGrammarCheckingEnabled())
</span><span class="lines">@@ -3168,9 +3171,9 @@
</span><span class="cx"> RefPtr<Node> shadowTreeRoot = referenceRange ? referenceRange->startContainer().nonBoundaryShadowTreeRootNode() : nullptr;
</span><span class="cx"> if (shadowTreeRoot) {
</span><span class="cx"> if (forward)
</span><del>- searchRange->setEnd(shadowTreeRoot.get(), shadowTreeRoot->countChildNodes());
</del><ins>+ searchRange->setEnd(*shadowTreeRoot, shadowTreeRoot->countChildNodes());
</ins><span class="cx"> else
</span><del>- searchRange->setStart(shadowTreeRoot.get(), 0);
</del><ins>+ searchRange->setStart(*shadowTreeRoot, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> resultRange(findPlainText(*searchRange, target, options));
</span><span class="lines">@@ -3186,9 +3189,9 @@
</span><span class="cx">
</span><span class="cx"> if (shadowTreeRoot) {
</span><span class="cx"> if (forward)
</span><del>- searchRange->setEnd(shadowTreeRoot.get(), shadowTreeRoot->countChildNodes());
</del><ins>+ searchRange->setEnd(*shadowTreeRoot, shadowTreeRoot->countChildNodes());
</ins><span class="cx"> else
</span><del>- searchRange->setStart(shadowTreeRoot.get(), 0);
</del><ins>+ searchRange->setStart(*shadowTreeRoot, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> resultRange = findPlainText(*searchRange, target, options);
</span><span class="lines">@@ -3197,10 +3200,12 @@
</span><span class="cx"> // If nothing was found in the shadow tree, search in main content following the shadow tree.
</span><span class="cx"> if (resultRange->collapsed() && shadowTreeRoot) {
</span><span class="cx"> searchRange = rangeOfContents(document());
</span><del>- if (forward)
- searchRange->setStartAfter(shadowTreeRoot->shadowHost());
- else
- searchRange->setEndBefore(shadowTreeRoot->shadowHost());
</del><ins>+ if (shadowTreeRoot->shadowHost()) {
+ if (forward)
+ searchRange->setStartAfter(*shadowTreeRoot->shadowHost());
+ else
+ searchRange->setEndBefore(*shadowTreeRoot->shadowHost());
+ }
</ins><span class="cx">
</span><span class="cx"> resultRange = findPlainText(*searchRange, target, options);
</span><span class="cx"> }
</span><span class="lines">@@ -3223,7 +3228,7 @@
</span><span class="cx"> bool inRange = false;
</span><span class="cx"> for (HTMLFrameOwnerElement* ownerElement = frame->ownerElement(); ownerElement; ownerElement = ownerElement->document().ownerElement()) {
</span><span class="cx"> if (&ownerElement->document() == &range->ownerDocument()) {
</span><del>- inRange = range->intersectsNode(ownerElement, IGNORE_EXCEPTION);
</del><ins>+ inRange = range->intersectsNode(*ownerElement, IGNORE_EXCEPTION);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3255,8 +3260,8 @@
</span><span class="cx"> if (!resultRange->startContainer().isInShadowTree())
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- searchRange->setStartAfter(resultRange->startContainer().shadowHost(), IGNORE_EXCEPTION);
- searchRange->setEnd(&originalEndContainer, originalEndOffset, IGNORE_EXCEPTION);
</del><ins>+ searchRange->setStartAfter(*resultRange->startContainer().shadowHost(), IGNORE_EXCEPTION);
+ searchRange->setEnd(originalEndContainer, originalEndOffset, IGNORE_EXCEPTION);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3275,11 +3280,11 @@
</span><span class="cx"> // result range. There is no need to use a VisiblePosition here,
</span><span class="cx"> // since findPlainText will use a TextIterator to go over the visible
</span><span class="cx"> // text nodes.
</span><del>- searchRange->setStart(&resultRange->endContainer(), resultRange->endOffset(), IGNORE_EXCEPTION);
</del><ins>+ searchRange->setStart(resultRange->endContainer(), resultRange->endOffset(), IGNORE_EXCEPTION);
</ins><span class="cx">
</span><span class="cx"> Node* shadowTreeRoot = searchRange->shadowRoot();
</span><span class="cx"> if (searchRange->collapsed() && shadowTreeRoot)
</span><del>- searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->countChildNodes(), IGNORE_EXCEPTION);
</del><ins>+ searchRange->setEnd(*shadowTreeRoot, shadowTreeRoot->countChildNodes(), IGNORE_EXCEPTION);
</ins><span class="cx"> } while (true);
</span><span class="cx">
</span><span class="cx"> return matchCount;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditorCommand.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditorCommand.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/EditorCommand.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -228,12 +228,11 @@
</span><span class="cx"> return static_cast<unsigned>(Scrollbar::pageStep(height));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<Range> unionDOMRanges(Range* a, Range* b)
</del><ins>+static RefPtr<Range> unionDOMRanges(Range& a, Range& b)
</ins><span class="cx"> {
</span><del>- Range* start = a->compareBoundaryPoints(Range::START_TO_START, b, ASSERT_NO_EXCEPTION) <= 0 ? a : b;
- Range* end = a->compareBoundaryPoints(Range::END_TO_END, b, ASSERT_NO_EXCEPTION) <= 0 ? b : a;
-
- return Range::create(a->ownerDocument(), &start->startContainer(), start->startOffset(), &end->endContainer(), end->endOffset());
</del><ins>+ Range& start = a.compareBoundaryPoints(Range::START_TO_START, b, ASSERT_NO_EXCEPTION) <= 0 ? a : b;
+ Range& end = a.compareBoundaryPoints(Range::END_TO_END, b, ASSERT_NO_EXCEPTION) <= 0 ? b : a;
+ return Range::create(a.ownerDocument(), &start.startContainer(), start.startOffset(), &end.endContainer(), end.endOffset());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Execute command functions
</span><span class="lines">@@ -356,8 +355,8 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Range> mark = frame.editor().mark().toNormalizedRange();
</span><span class="cx"> FrameSelection& selection = frame.selection();
</span><del>- if (mark) {
- bool selected = selection.setSelectedRange(unionDOMRanges(mark.get(), frame.editor().selectedRange().get()).get(), DOWNSTREAM, true);
</del><ins>+ if (mark && frame.editor().selectedRange()) {
+ bool selected = selection.setSelectedRange(unionDOMRanges(*mark, *frame.editor().selectedRange()).get(), DOWNSTREAM, true);
</ins><span class="cx"> ASSERT(selected);
</span><span class="cx"> if (!selected)
</span><span class="cx"> return false;
</span><span class="lines">@@ -1010,7 +1009,7 @@
</span><span class="cx"> systemBeep();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- frame.selection().setSelectedRange(unionDOMRanges(mark.get(), selection.get()).get(), DOWNSTREAM, true);
</del><ins>+ frame.selection().setSelectedRange(unionDOMRanges(*mark, *selection).get(), DOWNSTREAM, true);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFormatBlockCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FormatBlockCommand.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FormatBlockCommand.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/FormatBlockCommand.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> if (!root || !refNode)
</span><span class="cx"> return;
</span><span class="cx"> if (isElementForFormatBlock(refNode->tagQName()) && start == startOfBlock(start)
</span><del>- && (end == endOfBlock(end) || isNodeVisiblyContainedWithin(refNode, range.get()))
</del><ins>+ && (end == endOfBlock(end) || isNodeVisiblyContainedWithin(*refNode, range.get()))
</ins><span class="cx"> && refNode != root && !root->isDescendantOf(refNode)) {
</span><span class="cx"> // Already in a block element that only contains the current paragraph
</span><span class="cx"> if (refNode->hasTagName(tagName()))
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> m_selection.setWithoutValidation(m_selection.end(), m_selection.start());
</span><span class="cx"> } else if (RefPtr<Range> range = m_selection.firstRange()) {
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- Range::CompareResults compareResult = range->compareNode(&node, ec);
</del><ins>+ Range::CompareResults compareResult = range->compareNode(node, ec);
</ins><span class="cx"> if (!ec && (compareResult == Range::NODE_BEFORE_AND_AFTER || compareResult == Range::NODE_INSIDE)) {
</span><span class="cx"> // If we did nothing here, when this node's renderer was destroyed, the rect that it
</span><span class="cx"> // occupied would be invalidated, but, selection gaps that change as a result of
</span><span class="lines">@@ -2605,7 +2605,7 @@
</span><span class="cx"> return rangeByAlteringCurrentSelection(AlterationExtend, amount);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameSelection::selectRangeOnElement(unsigned location, unsigned length, Node* node)
</del><ins>+void FrameSelection::selectRangeOnElement(unsigned location, unsigned length, Node& node)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Range> resultRange = m_frame->document()->createRange();
</span><span class="cx"> ExceptionCode ec = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool selectionAtWordStart() const;
</span><span class="cx"> WEBCORE_EXPORT PassRefPtr<Range> rangeByMovingCurrentSelection(int amount) const;
</span><span class="cx"> WEBCORE_EXPORT PassRefPtr<Range> rangeByExtendingCurrentSelection(int amount) const;
</span><del>- WEBCORE_EXPORT void selectRangeOnElement(unsigned location, unsigned length, Node*);
</del><ins>+ WEBCORE_EXPORT void selectRangeOnElement(unsigned location, unsigned length, Node&);
</ins><span class="cx"> WEBCORE_EXPORT void clearCurrentSelection();
</span><span class="cx"> void setCaretBlinks(bool caretBlinks = true);
</span><span class="cx"> WEBCORE_EXPORT void setCaretColor(const Color&);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertListCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertListCommand.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertListCommand.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/InsertListCommand.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If the entire list is selected, then convert the whole list.
</span><del>- if (switchListType && isNodeVisiblyContainedWithin(listNode.get(), currentSelection)) {
</del><ins>+ if (switchListType && isNodeVisiblyContainedWithin(*listNode, currentSelection)) {
</ins><span class="cx"> bool rangeStartIsInList = visiblePositionBeforeNode(listNode.get()) == currentSelection->startPosition();
</span><span class="cx"> bool rangeEndIsInList = visiblePositionAfterNode(listNode.get()) == currentSelection->endPosition();
</span><span class="cx">
</span><span class="lines">@@ -243,9 +243,9 @@
</span><span class="cx"> // Restore the start and the end of current selection if they started inside listNode
</span><span class="cx"> // because moveParagraphWithClones could have removed them.
</span><span class="cx"> if (rangeStartIsInList && newList)
</span><del>- currentSelection->setStart(newList, 0, IGNORE_EXCEPTION);
</del><ins>+ currentSelection->setStart(*newList, 0, IGNORE_EXCEPTION);
</ins><span class="cx"> if (rangeEndIsInList && newList)
</span><del>- currentSelection->setEnd(newList, lastOffsetInNode(newList.get()), IGNORE_EXCEPTION);
</del><ins>+ currentSelection->setEnd(*newList, lastOffsetInNode(newList.get()), IGNORE_EXCEPTION);
</ins><span class="cx">
</span><span class="cx"> setEndingSelection(VisiblePosition(firstPositionInNode(newList.get())));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextCheckingHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextCheckingHelper.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -174,8 +174,13 @@
</span><span class="cx"> int TextCheckingParagraph::offsetTo(const Position& position, ExceptionCode& ec) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_checkingRange);
</span><ins>+ if (!position.containerNode()) {
+ ec = TypeError;
+ return 0;
+ }
+
</ins><span class="cx"> Ref<Range> range = offsetAsRange()->cloneRange();
</span><del>- range->setEnd(position.containerNode(), position.computeOffsetInContainerNode(), ec);
</del><ins>+ range->setEnd(*position.containerNode(), position.computeOffsetInContainerNode(), ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return 0;
</span><span class="cx"> return TextIterator::rangeLength(range.ptr());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -1479,8 +1479,8 @@
</span><span class="cx"> Node& node = range->startContainer();
</span><span class="cx"> ASSERT(&node == &range->endContainer());
</span><span class="cx"> int offset = range->startOffset() + m_runOffset;
</span><del>- range->setStart(&node, offset);
- range->setEnd(&node, offset + 1);
</del><ins>+ range->setStart(node, offset);
+ range->setEnd(node, offset + 1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return range;
</span><span class="lines">@@ -1569,8 +1569,8 @@
</span><span class="cx"> Node& node = r->startContainer();
</span><span class="cx"> ASSERT(&node == &r->endContainer());
</span><span class="cx"> int offset = r->endOffset() - m_runOffset;
</span><del>- r->setStart(&node, offset - 1);
- r->setEnd(&node, offset);
</del><ins>+ r->setStart(node, offset - 1);
+ r->setEnd(node, offset);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return r;
</span><span class="lines">@@ -2479,8 +2479,8 @@
</span><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><del>- resultRange->setStart(&textRunRange->startContainer(), 0);
- resultRange->setEnd(&textRunRange->startContainer(), 0);
</del><ins>+ resultRange->setStart(textRunRange->startContainer(), 0);
+ resultRange->setEnd(textRunRange->startContainer(), 0);
</ins><span class="cx"> return WTFMove(resultRange);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2498,12 +2498,12 @@
</span><span class="cx"> it.advance();
</span><span class="cx"> if (!it.atEnd()) {
</span><span class="cx"> Ref<Range> range = it.range();
</span><del>- textRunRange->setEnd(&range->startContainer(), range->startOffset());
</del><ins>+ textRunRange->setEnd(range->startContainer(), range->startOffset());
</ins><span class="cx"> } else {
</span><span class="cx"> Position runStart = textRunRange->startPosition();
</span><span class="cx"> Position runEnd = VisiblePosition(runStart).next().deepEquivalent();
</span><span class="cx"> if (runEnd.isNotNull())
</span><del>- textRunRange->setEnd(runEnd.containerNode(), runEnd.computeOffsetInContainerNode());
</del><ins>+ textRunRange->setEnd(*runEnd.containerNode(), runEnd.computeOffsetInContainerNode());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2512,24 +2512,24 @@
</span><span class="cx"> startRangeFound = true;
</span><span class="cx"> if (textRunRange->startContainer().isTextNode()) {
</span><span class="cx"> int offset = rangeLocation - docTextPosition;
</span><del>- resultRange->setStart(&textRunRange->startContainer(), offset + textRunRange->startOffset());
</del><ins>+ resultRange->setStart(textRunRange->startContainer(), offset + textRunRange->startOffset());
</ins><span class="cx"> } else {
</span><span class="cx"> if (rangeLocation == docTextPosition)
</span><del>- resultRange->setStart(&textRunRange->startContainer(), textRunRange->startOffset());
</del><ins>+ resultRange->setStart(textRunRange->startContainer(), textRunRange->startOffset());
</ins><span class="cx"> else
</span><del>- resultRange->setStart(&textRunRange->endContainer(), textRunRange->endOffset());
</del><ins>+ resultRange->setStart(textRunRange->endContainer(), textRunRange->endOffset());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (foundEnd) {
</span><span class="cx"> if (textRunRange->startContainer().isTextNode()) {
</span><span class="cx"> int offset = rangeEnd - docTextPosition;
</span><del>- resultRange->setEnd(&textRunRange->startContainer(), offset + textRunRange->startOffset());
</del><ins>+ resultRange->setEnd(textRunRange->startContainer(), offset + textRunRange->startOffset());
</ins><span class="cx"> } else {
</span><span class="cx"> if (rangeEnd == docTextPosition)
</span><del>- resultRange->setEnd(&textRunRange->startContainer(), textRunRange->startOffset());
</del><ins>+ resultRange->setEnd(textRunRange->startContainer(), textRunRange->startOffset());
</ins><span class="cx"> else
</span><del>- resultRange->setEnd(&textRunRange->endContainer(), textRunRange->endOffset());
</del><ins>+ resultRange->setEnd(textRunRange->endContainer(), textRunRange->endOffset());
</ins><span class="cx"> }
</span><span class="cx"> docTextPosition += length;
</span><span class="cx"> break;
</span><span class="lines">@@ -2542,7 +2542,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (rangeLength && rangeEnd > docTextPosition) // rangeEnd is out of bounds
</span><del>- resultRange->setEnd(&textRunRange->endContainer(), textRunRange->endOffset());
</del><ins>+ resultRange->setEnd(textRunRange->endContainer(), textRunRange->endOffset());
</ins><span class="cx">
</span><span class="cx"> return WTFMove(resultRange);
</span><span class="cx"> }
</span><span class="lines">@@ -2566,7 +2566,7 @@
</span><span class="cx"> ASSERT(&testRange->startContainer() == scope);
</span><span class="cx"> location = TextIterator::rangeLength(testRange.ptr());
</span><span class="cx">
</span><del>- testRange->setEnd(&range->endContainer(), range->endOffset(), IGNORE_EXCEPTION);
</del><ins>+ testRange->setEnd(range->endContainer(), range->endOffset(), IGNORE_EXCEPTION);
</ins><span class="cx"> ASSERT(&testRange->startContainer() == scope);
</span><span class="cx"> length = TextIterator::rangeLength(testRange.ptr()) - location;
</span><span class="cx"> return true;
</span><span class="lines">@@ -2623,7 +2623,7 @@
</span><span class="cx">
</span><span class="cx"> if (buffer.needsMoreContext()) {
</span><span class="cx"> Ref<Range> beforeStartRange = range.ownerDocument().createRange();
</span><del>- beforeStartRange->setEnd(&range.startContainer(), range.startOffset());
</del><ins>+ beforeStartRange->setEnd(range.startContainer(), range.startOffset());
</ins><span class="cx"> for (SimplifiedBackwardsTextIterator backwardsIterator(beforeStartRange.get()); !backwardsIterator.atEnd(); backwardsIterator.advance()) {
</span><span class="cx"> buffer.prependContext(backwardsIterator.text());
</span><span class="cx"> if (!buffer.needsMoreContext())
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisiblePositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisiblePosition.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisiblePosition.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/VisiblePosition.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -730,24 +730,32 @@
</span><span class="cx"> return VisiblePosition(r->endPosition(), affinity);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool setStart(Range *r, const VisiblePosition &visiblePosition)
</del><ins>+bool setStart(Range* range, const VisiblePosition& visiblePosition)
</ins><span class="cx"> {
</span><del>- if (!r)
</del><ins>+ if (!range)
</ins><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> Position p = visiblePosition.deepEquivalent().parentAnchoredEquivalent();
</span><del>- int code = 0;
- r->setStart(p.containerNode(), p.offsetInContainerNode(), code);
- return code == 0;
</del><ins>+ if (!p.containerNode())
+ return false;
+
+ int ec = 0;
+ range->setStart(*p.containerNode(), p.offsetInContainerNode(), ec);
+ return !ec;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool setEnd(Range *r, const VisiblePosition &visiblePosition)
</del><ins>+bool setEnd(Range* range, const VisiblePosition& visiblePosition)
</ins><span class="cx"> {
</span><del>- if (!r)
</del><ins>+ if (!range)
</ins><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> Position p = visiblePosition.deepEquivalent().parentAnchoredEquivalent();
</span><del>- int code = 0;
- r->setEnd(p.containerNode(), p.offsetInContainerNode(), code);
- return code == 0;
</del><ins>+ if (!p.containerNode())
+ return false;
+
+ int ec = 0;
+ range->setEnd(*p.containerNode(), p.offsetInContainerNode(), ec);
+ return !ec;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Maybe this should be deprecated too, like the underlying function?
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleSelection.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleSelection.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/VisibleSelection.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -213,8 +213,8 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx">
</span><span class="cx"> Position start(pos.parentAnchoredEquivalent());
</span><del>- searchRange->selectNodeContents(boundary, ec);
- searchRange->setStart(start.containerNode(), start.offsetInContainerNode(), ec);
</del><ins>+ searchRange->selectNodeContents(*boundary, ec);
+ searchRange->setStart(*start.containerNode(), start.offsetInContainerNode(), ec);
</ins><span class="cx">
</span><span class="cx"> ASSERT(!ec);
</span><span class="cx"> if (ec)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -569,7 +569,11 @@
</span><span class="cx"> Document& boundaryDocument = boundary->document();
</span><span class="cx"> Position start = createLegacyEditingPosition(boundary, 0).parentAnchoredEquivalent();
</span><span class="cx"> Position end = pos.parentAnchoredEquivalent();
</span><del>- RefPtr<Range> searchRange = Range::create(boundaryDocument);
</del><ins>+
+ if (start.isNull() || end.isNull())
+ return VisiblePosition();
+
+ Ref<Range> searchRange = Range::create(boundaryDocument);
</ins><span class="cx">
</span><span class="cx"> Vector<UChar, 1024> string;
</span><span class="cx"> unsigned suffixLength = 0;
</span><span class="lines">@@ -577,19 +581,19 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> if (requiresContextForWordBoundary(c.characterBefore())) {
</span><span class="cx"> RefPtr<Range> forwardsScanRange(boundaryDocument.createRange());
</span><del>- forwardsScanRange->setEndAfter(boundary, ec);
- forwardsScanRange->setStart(end.deprecatedNode(), end.deprecatedEditingOffset(), ec);
</del><ins>+ forwardsScanRange->setEndAfter(*boundary, ec);
+ forwardsScanRange->setStart(*end.deprecatedNode(), end.deprecatedEditingOffset(), ec);
</ins><span class="cx"> suffixLength = suffixLengthForRange(forwardsScanRange, string);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- searchRange->setStart(start.deprecatedNode(), start.deprecatedEditingOffset(), ec);
- searchRange->setEnd(end.deprecatedNode(), end.deprecatedEditingOffset(), ec);
</del><ins>+ searchRange->setStart(*start.deprecatedNode(), start.deprecatedEditingOffset(), ec);
+ searchRange->setEnd(*end.deprecatedNode(), end.deprecatedEditingOffset(), ec);
</ins><span class="cx">
</span><span class="cx"> ASSERT(!ec);
</span><span class="cx"> if (ec)
</span><span class="cx"> return VisiblePosition();
</span><span class="cx">
</span><del>- SimplifiedBackwardsTextIterator it(*searchRange);
</del><ins>+ SimplifiedBackwardsTextIterator it(searchRange);
</ins><span class="cx"> unsigned next = backwardSearchForBoundaryWithTextIterator(it, string, suffixLength, searchFunction);
</span><span class="cx">
</span><span class="cx"> if (!next)
</span><span class="lines">@@ -602,7 +606,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Use the character iterator to translate the next value into a DOM position.
</span><del>- BackwardsCharacterIterator charIt(*searchRange);
</del><ins>+ BackwardsCharacterIterator charIt(searchRange);
</ins><span class="cx"> charIt.advance(string.size() - suffixLength - next);
</span><span class="cx"> // FIXME: charIt can get out of shadow host.
</span><span class="cx"> return VisiblePosition(charIt.range()->endPosition(), DOWNSTREAM);
</span><span class="lines">@@ -616,7 +620,7 @@
</span><span class="cx"> return VisiblePosition();
</span><span class="cx">
</span><span class="cx"> Document& boundaryDocument = boundary->document();
</span><del>- RefPtr<Range> searchRange(boundaryDocument.createRange());
</del><ins>+ Ref<Range> searchRange = boundaryDocument.createRange();
</ins><span class="cx"> Position start(pos.parentAnchoredEquivalent());
</span><span class="cx">
</span><span class="cx"> Vector<UChar, 1024> string;
</span><span class="lines">@@ -624,20 +628,22 @@
</span><span class="cx">
</span><span class="cx"> if (requiresContextForWordBoundary(c.characterAfter())) {
</span><span class="cx"> RefPtr<Range> backwardsScanRange(boundaryDocument.createRange());
</span><del>- backwardsScanRange->setEnd(start.deprecatedNode(), start.deprecatedEditingOffset(), IGNORE_EXCEPTION);
</del><ins>+ if (start.deprecatedNode())
+ backwardsScanRange->setEnd(*start.deprecatedNode(), start.deprecatedEditingOffset(), IGNORE_EXCEPTION);
</ins><span class="cx"> prefixLength = prefixLengthForRange(backwardsScanRange, string);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- searchRange->selectNodeContents(boundary, IGNORE_EXCEPTION);
- searchRange->setStart(start.deprecatedNode(), start.deprecatedEditingOffset(), IGNORE_EXCEPTION);
- TextIterator it(searchRange.get(), TextIteratorEmitsCharactersBetweenAllVisiblePositions);
</del><ins>+ searchRange->selectNodeContents(*boundary, IGNORE_EXCEPTION);
+ if (start.deprecatedNode())
+ searchRange->setStart(*start.deprecatedNode(), start.deprecatedEditingOffset(), IGNORE_EXCEPTION);
+ TextIterator it(searchRange.ptr(), TextIteratorEmitsCharactersBetweenAllVisiblePositions);
</ins><span class="cx"> unsigned next = forwardSearchForBoundaryWithTextIterator(it, string, prefixLength, searchFunction);
</span><span class="cx">
</span><span class="cx"> if (it.atEnd() && next == string.size())
</span><span class="cx"> pos = searchRange->endPosition();
</span><span class="cx"> else if (next > prefixLength) {
</span><span class="cx"> // Use the character iterator to translate the next value into a DOM position.
</span><del>- CharacterIterator charIt(*searchRange, TextIteratorEmitsCharactersBetweenAllVisiblePositions);
</del><ins>+ CharacterIterator charIt(searchRange, TextIteratorEmitsCharactersBetweenAllVisiblePositions);
</ins><span class="cx"> charIt.advance(next - prefixLength - 1);
</span><span class="cx"> RefPtr<Range> characterRange = charIt.range();
</span><span class="cx"> pos = characterRange->endPosition();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/htmlediting.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -1164,13 +1164,12 @@
</span><span class="cx"> return VisiblePosition(range->startPosition());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-VisiblePosition visiblePositionForIndexUsingCharacterIterator(Node* node, int index)
</del><ins>+VisiblePosition visiblePositionForIndexUsingCharacterIterator(Node& node, int index)
</ins><span class="cx"> {
</span><del>- ASSERT(node);
</del><span class="cx"> if (index <= 0)
</span><del>- return VisiblePosition(firstPositionInOrBeforeNode(node), DOWNSTREAM);
</del><ins>+ return VisiblePosition(firstPositionInOrBeforeNode(&node), DOWNSTREAM);
</ins><span class="cx">
</span><del>- RefPtr<Range> range = Range::create(node->document());
</del><ins>+ RefPtr<Range> range = Range::create(node.document());
</ins><span class="cx"> range->selectNodeContents(node, IGNORE_EXCEPTION);
</span><span class="cx"> CharacterIterator it(*range);
</span><span class="cx"> it.advance(index - 1);
</span><span class="lines">@@ -1186,20 +1185,19 @@
</span><span class="cx">
</span><span class="cx"> // Determines whether a node is inside a range or visibly starts and ends at the boundaries of the range.
</span><span class="cx"> // Call this function to determine whether a node is visibly fit inside selectedRange
</span><del>-bool isNodeVisiblyContainedWithin(Node* node, const Range* selectedRange)
</del><ins>+bool isNodeVisiblyContainedWithin(Node& node, const Range* selectedRange)
</ins><span class="cx"> {
</span><del>- ASSERT(node);
</del><span class="cx"> ASSERT(selectedRange);
</span><span class="cx"> // If the node is inside the range, then it surely is contained within
</span><span class="cx"> if (selectedRange->compareNode(node, IGNORE_EXCEPTION) == Range::NODE_INSIDE)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- bool startIsVisuallySame = visiblePositionBeforeNode(node) == selectedRange->startPosition();
- if (startIsVisuallySame && comparePositions(positionInParentAfterNode(node), selectedRange->endPosition()) < 0)
</del><ins>+ bool startIsVisuallySame = visiblePositionBeforeNode(&node) == selectedRange->startPosition();
+ if (startIsVisuallySame && comparePositions(positionInParentAfterNode(&node), selectedRange->endPosition()) < 0)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- bool endIsVisuallySame = visiblePositionAfterNode(node) == selectedRange->endPosition();
- if (endIsVisuallySame && comparePositions(selectedRange->startPosition(), positionInParentBeforeNode(node)) < 0)
</del><ins>+ bool endIsVisuallySame = visiblePositionAfterNode(&node) == selectedRange->endPosition();
+ if (endIsVisuallySame && comparePositions(selectedRange->startPosition(), positionInParentBeforeNode(&node)) < 0)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return startIsVisuallySame && endIsVisuallySame;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.h (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.h 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/htmlediting.h 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> bool isListElement(Node*);
</span><span class="cx"> bool isListItem(const Node*);
</span><span class="cx"> bool isNodeRendered(const Node*);
</span><del>-bool isNodeVisiblyContainedWithin(Node*, const Range*);
</del><ins>+bool isNodeVisiblyContainedWithin(Node&, const Range*);
</ins><span class="cx"> bool isRenderedAsNonInlineTableImageOrHR(const Node*);
</span><span class="cx"> bool areIdenticalElements(const Node*, const Node*);
</span><span class="cx"> bool isNonTableCellHTMLBlockElement(const Node*);
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> int indexForVisiblePosition(const VisiblePosition&, RefPtr<ContainerNode>& scope);
</span><span class="cx"> int indexForVisiblePosition(Node*, const VisiblePosition&, bool forSelectionPreservation);
</span><span class="cx"> VisiblePosition visiblePositionForIndex(int index, ContainerNode* scope);
</span><del>-VisiblePosition visiblePositionForIndexUsingCharacterIterator(Node*, int index); // FIXME: Why do we need this version?
</del><ins>+VisiblePosition visiblePositionForIndexUsingCharacterIterator(Node&, int index); // FIXME: Why do we need this version?
</ins><span class="cx">
</span><span class="cx"> // -------------------------------------------------------------------------
</span><span class="cx"> // HTMLElement
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> ASSERT(commonAncestor);
</span><span class="cx"> auto* enclosingAnchor = enclosingElementWithTag(firstPositionInNode(commonAncestor), HTMLNames::aTag);
</span><span class="cx"> if (enclosingAnchor && comparePositions(firstPositionInOrBeforeNode(range->startPosition().anchorNode()), range->startPosition()) >= 0)
</span><del>- range->setStart(enclosingAnchor, 0, IGNORE_EXCEPTION);
</del><ins>+ range->setStart(*enclosingAnchor, 0, IGNORE_EXCEPTION);
</ins><span class="cx"> return range;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -413,7 +413,8 @@
</span><span class="cx"> if (!selectedRange || selectedRange->collapsed()) {
</span><span class="cx"> Document& document = m_context.hitTestResult().innerNonSharedNode()->document();
</span><span class="cx"> selectedRange = document.createRange();
</span><del>- selectedRange->selectNode(document.documentElement(), IGNORE_EXCEPTION);
</del><ins>+ if (document.documentElement())
+ selectedRange->selectNode(*document.documentElement(), IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx"> m_client.speak(plainText(selectedRange.get()));
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMSelection.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMSelection.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/page/DOMSelection.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -393,10 +393,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> range = selection.selection().toNormalizedRange();
</span><del>- if (r->compareBoundaryPoints(Range::START_TO_START, range.get(), IGNORE_EXCEPTION) == -1) {
</del><ins>+ if (!range)
+ return;
+
+ if (r->compareBoundaryPoints(Range::START_TO_START, *range, IGNORE_EXCEPTION) == -1) {
</ins><span class="cx"> // We don't support discontiguous selection. We don't do anything if r and range don't intersect.
</span><del>- if (r->compareBoundaryPoints(Range::START_TO_END, range.get(), IGNORE_EXCEPTION) > -1) {
- if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), IGNORE_EXCEPTION) == -1) {
</del><ins>+ if (r->compareBoundaryPoints(Range::START_TO_END, *range, IGNORE_EXCEPTION) > -1) {
+ if (r->compareBoundaryPoints(Range::END_TO_END, *range, IGNORE_EXCEPTION) == -1) {
</ins><span class="cx"> // The original range and r intersect.
</span><span class="cx"> selection.moveTo(r->startPosition(), range->endPosition(), DOWNSTREAM);
</span><span class="cx"> } else {
</span><span class="lines">@@ -407,8 +410,8 @@
</span><span class="cx"> } else {
</span><span class="cx"> // We don't support discontiguous selection. We don't do anything if r and range don't intersect.
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- if (r->compareBoundaryPoints(Range::END_TO_START, range.get(), ec) < 1 && !ec) {
- if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), IGNORE_EXCEPTION) == -1) {
</del><ins>+ if (r->compareBoundaryPoints(Range::END_TO_START, *range, ec) < 1 && !ec) {
+ if (r->compareBoundaryPoints(Range::END_TO_END, *range, IGNORE_EXCEPTION) == -1) {
</ins><span class="cx"> // The original range contains r.
</span><span class="cx"> selection.moveTo(range.get());
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/page/DragController.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx"> static void selectElement(Element& element)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Range> range = element.document().createRange();
</span><del>- range->selectNode(&element);
</del><ins>+ range->selectNode(element);
</ins><span class="cx"> element.document().frame()->selection().setSelection(VisibleSelection(*range, DOWNSTREAM));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -2507,7 +2507,7 @@
</span><span class="cx"> // focused if the user does a mouseup over it, however, because the mouseup
</span><span class="cx"> // will set a selection inside it, which will call setFocuseNodeIfNeeded.
</span><span class="cx"> if (m_frame.selection().isRange()
</span><del>- && m_frame.selection().toNormalizedRange()->compareNode(element, IGNORE_EXCEPTION) == Range::NODE_INSIDE
</del><ins>+ && m_frame.selection().toNormalizedRange()->compareNode(*element, IGNORE_EXCEPTION) == Range::NODE_INSIDE
</ins><span class="cx"> && element->isDescendantOf(m_frame.document()->focusedElement()))
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/page/Page.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -632,14 +632,14 @@
</span><span class="cx"> RefPtr<Range> selectedRange = frameWithSelection->selection().selection().firstRange();
</span><span class="cx"> if (options & Backwards) {
</span><span class="cx"> for (size_t i = matchRanges.size(); i > 0; --i) {
</span><del>- if (selectedRange->compareBoundaryPoints(Range::END_TO_START, matchRanges[i - 1].get(), IGNORE_EXCEPTION) > 0) {
</del><ins>+ if (selectedRange->compareBoundaryPoints(Range::END_TO_START, *matchRanges[i - 1], IGNORE_EXCEPTION) > 0) {
</ins><span class="cx"> indexForSelection = i - 1;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> for (size_t i = 0, size = matchRanges.size(); i < size; ++i) {
</span><del>- if (selectedRange->compareBoundaryPoints(Range::START_TO_END, matchRanges[i].get(), IGNORE_EXCEPTION) < 0) {
</del><ins>+ if (selectedRange->compareBoundaryPoints(Range::START_TO_END, *matchRanges[i], IGNORE_EXCEPTION) < 0) {
</ins><span class="cx"> indexForSelection = i;
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageTextIndicatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/TextIndicator.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/TextIndicator.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/page/TextIndicator.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> RenderObject* renderer = node->renderer();
</span><span class="cx"> if (!renderer)
</span><span class="cx"> continue;
</span><del>- if ((!renderer->isInline() || renderer->isReplaced()) && range.intersectsNode(node, ASSERT_NO_EXCEPTION))
</del><ins>+ if ((!renderer->isInline() || renderer->isReplaced()) && range.intersectsNode(*node, ASSERT_NO_EXCEPTION))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -694,8 +694,8 @@
</span><span class="cx"> if (!boxIntersectsRegion(logicalTopForRenderer, logicalBottomForRenderer, logicalTopForRegion, logicalBottomForRegion)) {
</span><span class="cx"> if (foundStartPosition) {
</span><span class="cx"> if (!startsAboveRegion) {
</span><del>- if (range->intersectsNode(node, IGNORE_EXCEPTION))
- range->setEndBefore(node, IGNORE_EXCEPTION);
</del><ins>+ if (range->intersectsNode(*node, IGNORE_EXCEPTION))
+ range->setEndBefore(*node, IGNORE_EXCEPTION);
</ins><span class="cx"> rangeObjects.append(range->cloneRange());
</span><span class="cx"> range = Range::create(contentElement->document());
</span><span class="cx"> startsAboveRegion = true;
</span><span class="lines">@@ -703,7 +703,7 @@
</span><span class="cx"> skipOverOutsideNodes = true;
</span><span class="cx"> }
</span><span class="cx"> if (skipOverOutsideNodes)
</span><del>- range->setStartAfter(node, IGNORE_EXCEPTION);
</del><ins>+ range->setStartAfter(*node, IGNORE_EXCEPTION);
</ins><span class="cx"> foundStartPosition = false;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx"> // the range is closed.
</span><span class="cx"> if (startsAboveRegion) {
</span><span class="cx"> startsAboveRegion = false;
</span><del>- range->setStartBefore(node, IGNORE_EXCEPTION);
</del><ins>+ range->setStartBefore(*node, IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> skipOverOutsideNodes = false;
</span><span class="lines">@@ -770,7 +770,7 @@
</span><span class="cx"> // for elements that ends inside the region, set the end position to be after them
</span><span class="cx"> // allow this end position to be changed only by other elements that are not descendants of the current end node
</span><span class="cx"> if (endsBelowRegion || (!endsBelowRegion && !node->isDescendantOf(lastEndNode))) {
</span><del>- range->setEndAfter(node, IGNORE_EXCEPTION);
</del><ins>+ range->setEndAfter(*node, IGNORE_EXCEPTION);
</ins><span class="cx"> endsBelowRegion = false;
</span><span class="cx"> lastEndNode = node;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-21 Chris Dumez <cdumez@apple.com>
+
+ Drop [UsePointersEvenForNonNullableObjectArguments] from Range
+ https://bugs.webkit.org/show_bug.cgi?id=156805
+
+ Reviewed by Youenn Fablet.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _smartDeleteRangeForProposedRange:]):
+
</ins><span class="cx"> 2016-04-20 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB (Workers): Enable INDEXED_DATABASE_IN_WORKERS compile time flag, but disabled in RuntimeEnabledFeatures.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -873,11 +873,13 @@
</span><span class="cx"> newStart = newStart.parentAnchoredEquivalent();
</span><span class="cx"> newEnd = newEnd.parentAnchoredEquivalent();
</span><span class="cx">
</span><del>- RefPtr<Range> range = _private->coreFrame->document()->createRange();
- int exception = 0;
- range->setStart(newStart.containerNode(), newStart.offsetInContainerNode(), exception);
- range->setEnd(newStart.containerNode(), newStart.offsetInContainerNode(), exception);
- return kit(range.get());
</del><ins>+ Ref<Range> range = _private->coreFrame->document()->createRange();
+ if (newStart.containerNode()) {
+ int exception = 0;
+ range->setStart(*newStart.containerNode(), newStart.offsetInContainerNode(), exception);
+ range->setEnd(*newStart.containerNode(), newStart.offsetInContainerNode(), exception);
+ }
+ return kit(range.ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMDocumentFragment *)_documentFragmentWithMarkupString:(NSString *)markupString baseURLString:(NSString *)baseURLString
</span><span class="lines">@@ -1628,11 +1630,11 @@
</span><span class="cx"> if (!doc)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Node *node = core(element);
</del><ins>+ Node* node = core(element);
</ins><span class="cx"> if (!node->inDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- frame->selection().selectRangeOnElement(range.location, range.length, node);
</del><ins>+ frame->selection().selectRangeOnElement(range.location, range.length, *node);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMRange *)markedTextDOMRange
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebKit/win/WebView.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -6114,7 +6114,7 @@
</span><span class="cx"> if (RefPtr<Range> range = targetFrame->editor().hasComposition() ? targetFrame->editor().compositionRange() : targetFrame->selection().selection().toNormalizedRange()) {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> RefPtr<Range> tempRange = range->cloneRange();
</span><del>- tempRange->setStart(&tempRange->startContainer(), tempRange->startOffset() + charPos->dwCharPos, ec);
</del><ins>+ tempRange->setStart(tempRange->startContainer(), tempRange->startOffset() + charPos->dwCharPos, ec);
</ins><span class="cx"> caret = targetFrame->editor().firstRectForRange(tempRange.get());
</span><span class="cx"> }
</span><span class="cx"> caret = targetFrame->view()->contentsToWindow(caret);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-04-21 Chris Dumez <cdumez@apple.com>
+
+ Drop [UsePointersEvenForNonNullableObjectArguments] from Range
+ https://bugs.webkit.org/show_bug.cgi?id=156805
+
+ Reviewed by Youenn Fablet.
+
+ * WebProcess/InjectedBundle/API/mac/WKDOMRange.mm:
+ (-[WKDOMRange setStart:offset:]):
+ (-[WKDOMRange setEnd:offset:]):
+ (-[WKDOMRange selectNode:]):
+ (-[WKDOMRange selectNodeContents:]):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::contentsAsString):
+
</ins><span class="cx"> 2016-04-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] WebKitWebView should claim the contents size as its natural size
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKDOMRangemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -65,16 +65,20 @@
</span><span class="cx">
</span><span class="cx"> - (void)setStart:(WKDOMNode *)node offset:(int)offset
</span><span class="cx"> {
</span><ins>+ if (!node)
+ return;
</ins><span class="cx"> // FIXME: Do something about the exception.
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- _impl->setStart(WebKit::toWebCoreNode(node), offset, ec);
</del><ins>+ _impl->setStart(*WebKit::toWebCoreNode(node), offset, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setEnd:(WKDOMNode *)node offset:(int)offset
</span><span class="cx"> {
</span><ins>+ if (!node)
+ return;
</ins><span class="cx"> // FIXME: Do something about the exception.
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- _impl->setEnd(WebKit::toWebCoreNode(node), offset, ec);
</del><ins>+ _impl->setEnd(*WebKit::toWebCoreNode(node), offset, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)collapse:(BOOL)toStart
</span><span class="lines">@@ -84,16 +88,20 @@
</span><span class="cx">
</span><span class="cx"> - (void)selectNode:(WKDOMNode *)node
</span><span class="cx"> {
</span><ins>+ if (!node)
+ return;
</ins><span class="cx"> // FIXME: Do something about the exception.
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- _impl->selectNode(WebKit::toWebCoreNode(node), ec);
</del><ins>+ _impl->selectNode(*WebKit::toWebCoreNode(node), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)selectNodeContents:(WKDOMNode *)node
</span><span class="cx"> {
</span><ins>+ if (!node)
+ return;
</ins><span class="cx"> // FIXME: Do something about the exception.
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- _impl->selectNodeContents(WebKit::toWebCoreNode(node), ec);
</del><ins>+ _impl->selectNodeContents(*WebKit::toWebCoreNode(node), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKDOMNode *)startContainer
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> RefPtr<Range> range = document->createRange();
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- range->selectNode(documentElement.get(), ec);
</del><ins>+ range->selectNode(*documentElement, ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return String();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (199816 => 199817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-04-21 15:42:44 UTC (rev 199816)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-04-21 16:07:18 UTC (rev 199817)
</span><span class="lines">@@ -940,7 +940,7 @@
</span><span class="cx">
</span><span class="cx"> flags = IsBlockSelection;
</span><span class="cx"> range = Range::create(bestChoice->document());
</span><del>- range->selectNodeContents(bestChoice, ASSERT_NO_EXCEPTION);
</del><ins>+ range->selectNodeContents(*bestChoice, ASSERT_NO_EXCEPTION);
</ins><span class="cx"> return range->collapsed() ? nullptr : range;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -964,7 +964,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> range = Range::create(currentNode->document());
</span><del>- range->selectNodeContents(currentNode, ASSERT_NO_EXCEPTION);
</del><ins>+ range->selectNodeContents(*currentNode, ASSERT_NO_EXCEPTION);
</ins><span class="cx"> return range;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1220,8 +1220,8 @@
</span><span class="cx"> if (!first || !second)
</span><span class="cx"> return false;
</span><span class="cx"> return (first->commonAncestorContainer()->ownerDocument() == second->commonAncestorContainer()->ownerDocument()
</span><del>- && first->compareBoundaryPoints(Range::START_TO_START, second, ASSERT_NO_EXCEPTION) <= 0
- && first->compareBoundaryPoints(Range::END_TO_END, second, ASSERT_NO_EXCEPTION) >= 0);
</del><ins>+ && first->compareBoundaryPoints(Range::START_TO_START, *second, ASSERT_NO_EXCEPTION) <= 0
+ && first->compareBoundaryPoints(Range::END_TO_END, *second, ASSERT_NO_EXCEPTION) >= 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline RefPtr<Range> unionDOMRanges(Range* rangeA, Range* rangeB)
</span><span class="lines">@@ -1231,8 +1231,8 @@
</span><span class="cx"> if (!rangeA)
</span><span class="cx"> return rangeB;
</span><span class="cx">
</span><del>- Range* start = rangeA->compareBoundaryPoints(Range::START_TO_START, rangeB, ASSERT_NO_EXCEPTION) <= 0 ? rangeA : rangeB;
- Range* end = rangeA->compareBoundaryPoints(Range::END_TO_END, rangeB, ASSERT_NO_EXCEPTION) <= 0 ? rangeB : rangeA;
</del><ins>+ Range* start = rangeA->compareBoundaryPoints(Range::START_TO_START, *rangeB, ASSERT_NO_EXCEPTION) <= 0 ? rangeA : rangeB;
+ Range* end = rangeA->compareBoundaryPoints(Range::END_TO_END, *rangeB, ASSERT_NO_EXCEPTION) <= 0 ? rangeB : rangeA;
</ins><span class="cx">
</span><span class="cx"> return Range::create(rangeA->ownerDocument(), &start->startContainer(), start->startOffset(), &end->endContainer(), end->endOffset());
</span><span class="cx"> }
</span><span class="lines">@@ -2232,7 +2232,7 @@
</span><span class="cx"> info.dataDetectorResults = element->document().frame()->dataDetectionResults();
</span><span class="cx"> if (DataDetection::requiresExtendedContext(*element)) {
</span><span class="cx"> RefPtr<Range> linkRange = Range::create(element->document());
</span><del>- linkRange->selectNodeContents(element, ASSERT_NO_EXCEPTION);
</del><ins>+ linkRange->selectNodeContents(*element, ASSERT_NO_EXCEPTION);
</ins><span class="cx"> info.textBefore = plainTextReplacingNoBreakSpace(rangeExpandedByCharactersInDirectionAtWordBoundary(linkRange->startPosition(), dataDetectionExtendedContextLength, DirectionBackward).get(), TextIteratorDefaultBehavior, true);
</span><span class="cx"> info.textAfter = plainTextReplacingNoBreakSpace(rangeExpandedByCharactersInDirectionAtWordBoundary(linkRange->endPosition(), dataDetectionExtendedContextLength, DirectionForward).get(), TextIteratorDefaultBehavior, true);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>