<!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>[203733] trunk</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/203733">203733</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-26 13:54:25 -0700 (Tue, 26 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Second parameter to Range.isPointInRange() / comparePoint() should be mandatory
https://bugs.webkit.org/show_bug.cgi?id=160202
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Rebaseline W3C test now that more checks are passing.
* web-platform-tests/dom/interfaces-expected.txt:
Source/WebCore:
Second parameter to Range.isPointInRange() / comparePoint() should be mandatory
and be of type "unsigned long":
- https://dom.spec.whatwg.org/#interface-range
Firefox and Chrome agree with the specification.
No new tests, rebaselined existing tests.
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::traverseToOffsetInRange):
* dom/DocumentMarkerController.cpp:
(WebCore::DocumentMarkerController::removeMarkers):
(WebCore::DocumentMarkerController::markersInRange):
(DocumentMarkerController::setMarkersActive):
* dom/Range.cpp:
(WebCore::Range::isPointInRange):
(WebCore::Range::comparePoint):
(WebCore::Range::compareBoundaryPoints):
(WebCore::Range::toString):
(WebCore::Range::absoluteTextRects):
(WebCore::Range::absoluteTextQuads):
(WebCore::boundaryTextNodesMerged):
(WebCore::Range::getBorderAndTextQuads):
* dom/Range.h:
(WebCore::Range::startOffset):
(WebCore::Range::endOffset):
* dom/Range.idl:
* dom/RangeBoundaryPoint.h:
(WebCore::RangeBoundaryPoint::ensureOffsetIsValid):
(WebCore::RangeBoundaryPoint::toPosition):
(WebCore::RangeBoundaryPoint::offset):
(WebCore::RangeBoundaryPoint::setOffset):
(WebCore::RangeBoundaryPoint::setToBeforeChild):
(WebCore::RangeBoundaryPoint::setToAfterChild):
(WebCore::RangeBoundaryPoint::setToEndOfNode):
(WebCore::RangeBoundaryPoint::childBeforeWillBeRemoved):
(WebCore::RangeBoundaryPoint::invalidateOffset):
LayoutTests:
Update existing test to reflect behavior change.
* fast/dom/non-numeric-values-numeric-parameters-expected.txt:
* fast/dom/script-tests/non-numeric-values-numeric-parameters.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomnonnumericvaluesnumericparametersexpectedtxt">trunk/LayoutTests/fast/dom/non-numeric-values-numeric-parameters-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomscripttestsnonnumericvaluesnumericparametersjs">trunk/LayoutTests/fast/dom/script-tests/non-numeric-values-numeric-parameters.js</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdominterfacesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt</a></li>
<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="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleUtilcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentMarkerControllercpp">trunk/Source/WebCore/dom/DocumentMarkerController.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/LayoutTests/ChangeLog 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-26 Chris Dumez <cdumez@apple.com>
+
+ Second parameter to Range.isPointInRange() / comparePoint() should be mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=160202
+
+ Reviewed by Ryosuke Niwa.
+
+ Update existing test to reflect behavior change.
+
+ * fast/dom/non-numeric-values-numeric-parameters-expected.txt:
+ * fast/dom/script-tests/non-numeric-values-numeric-parameters.js:
+
</ins><span class="cx"> 2016-07-26 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Add support for fetch mode, in particular cors
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomnonnumericvaluesnumericparametersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/non-numeric-values-numeric-parameters-expected.txt (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/non-numeric-values-numeric-parameters-expected.txt 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/LayoutTests/fast/dom/non-numeric-values-numeric-parameters-expected.txt 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> PASS nonNumericPolicy('document.getElementsByTagName("div").item(x)') is 'any type allowed (but not omitted)'
</span><span class="cx"> PASS nonNumericPolicy('document.createRange().setStart(document, x)') is 'any type allowed (but not omitted)'
</span><span class="cx"> PASS nonNumericPolicy('document.createRange().setEnd(document, x)') is 'any type allowed (but not omitted)'
</span><del>-PASS nonNumericPolicy('document.createRange().comparePoint(document, x)') is 'any type allowed'
-PASS nonNumericPolicy('document.createRange().isPointInRange(document, x)') is 'any type allowed'
</del><ins>+PASS nonNumericPolicy('document.createRange().comparePoint(document, x)') is 'any type allowed (but not omitted)'
+PASS nonNumericPolicy('document.createRange().isPointInRange(document, x)') is 'any type allowed (but not omitted)'
</ins><span class="cx"> PASS nonNumericPolicy('getSelection().collapse(document, x)') is 'any type allowed'
</span><span class="cx"> PASS nonNumericPolicy('getSelection().setBaseAndExtent(document, x, document, 0)') is 'any type allowed'
</span><span class="cx"> PASS nonNumericPolicy('getSelection().setBaseAndExtent(document, 0, document, x)') is 'any type allowed'
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomscripttestsnonnumericvaluesnumericparametersjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/script-tests/non-numeric-values-numeric-parameters.js (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-tests/non-numeric-values-numeric-parameters.js 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/LayoutTests/fast/dom/script-tests/non-numeric-values-numeric-parameters.js 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -305,8 +305,8 @@
</span><span class="cx">
</span><span class="cx"> shouldBe("nonNumericPolicy('document.createRange().setStart(document, x)')", "'any type allowed (but not omitted)'");
</span><span class="cx"> shouldBe("nonNumericPolicy('document.createRange().setEnd(document, x)')", "'any type allowed (but not omitted)'");
</span><del>-shouldBe("nonNumericPolicy('document.createRange().comparePoint(document, x)')", "'any type allowed'");
-shouldBe("nonNumericPolicy('document.createRange().isPointInRange(document, x)')", "'any type allowed'");
</del><ins>+shouldBe("nonNumericPolicy('document.createRange().comparePoint(document, x)')", "'any type allowed (but not omitted)'");
+shouldBe("nonNumericPolicy('document.createRange().isPointInRange(document, x)')", "'any type allowed (but not omitted)'");
</ins><span class="cx">
</span><span class="cx"> // Selection
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-07-26 Chris Dumez <cdumez@apple.com>
+
+ Second parameter to Range.isPointInRange() / comparePoint() should be mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=160202
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline W3C test now that more checks are passing.
+
+ * web-platform-tests/dom/interfaces-expected.txt:
+
</ins><span class="cx"> 2016-07-26 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Add support for fetch mode, in particular cors
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdominterfacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -1316,8 +1316,8 @@
</span><span class="cx"> PASS Range interface: operation surroundContents(Node)
</span><span class="cx"> PASS Range interface: operation cloneRange()
</span><span class="cx"> PASS Range interface: operation detach()
</span><del>-FAIL Range interface: operation isPointInRange(Node,unsigned long) assert_equals: property has wrong .length expected 2 but got 1
-FAIL Range interface: operation comparePoint(Node,unsigned long) assert_equals: property has wrong .length expected 2 but got 1
</del><ins>+PASS Range interface: operation isPointInRange(Node,unsigned long)
+PASS Range interface: operation comparePoint(Node,unsigned long)
</ins><span class="cx"> PASS Range interface: operation intersectsNode(Node)
</span><span class="cx"> PASS Range interface: stringifier
</span><span class="cx"> PASS Range must be primary interface of document.createRange()
</span><span class="lines">@@ -1362,13 +1362,9 @@
</span><span class="cx"> PASS Range interface: document.createRange() must inherit property "cloneRange" with the proper type (25)
</span><span class="cx"> PASS Range interface: document.createRange() must inherit property "detach" with the proper type (26)
</span><span class="cx"> PASS Range interface: document.createRange() must inherit property "isPointInRange" with the proper type (27)
</span><del>-FAIL Range interface: calling isPointInRange(Node,unsigned long) on document.createRange() with too few arguments must throw TypeError assert_throws: Called with 1 arguments function "function () {
- fn.apply(obj, args);
- }" did not throw
</del><ins>+PASS Range interface: calling isPointInRange(Node,unsigned long) on document.createRange() with too few arguments must throw TypeError
</ins><span class="cx"> PASS Range interface: document.createRange() must inherit property "comparePoint" with the proper type (28)
</span><del>-FAIL Range interface: calling comparePoint(Node,unsigned long) on document.createRange() with too few arguments must throw TypeError assert_throws: Called with 1 arguments function "function () {
- fn.apply(obj, args);
- }" threw object "WrongDocumentError (DOM Exception 4): The object is in th..." ("WrongDocumentError") expected object "TypeError" ("TypeError")
</del><ins>+PASS Range interface: calling comparePoint(Node,unsigned long) on document.createRange() with too few arguments must throw TypeError
</ins><span class="cx"> PASS Range interface: document.createRange() must inherit property "intersectsNode" with the proper type (29)
</span><span class="cx"> PASS Range interface: calling intersectsNode(Node) on document.createRange() with too few arguments must throw TypeError
</span><span class="cx"> PASS Range must be primary interface of detachedRange
</span><span class="lines">@@ -1413,13 +1409,9 @@
</span><span class="cx"> PASS Range interface: detachedRange must inherit property "cloneRange" with the proper type (25)
</span><span class="cx"> PASS Range interface: detachedRange must inherit property "detach" with the proper type (26)
</span><span class="cx"> PASS Range interface: detachedRange must inherit property "isPointInRange" with the proper type (27)
</span><del>-FAIL Range interface: calling isPointInRange(Node,unsigned long) on detachedRange with too few arguments must throw TypeError assert_throws: Called with 1 arguments function "function () {
- fn.apply(obj, args);
- }" did not throw
</del><ins>+PASS Range interface: calling isPointInRange(Node,unsigned long) on detachedRange with too few arguments must throw TypeError
</ins><span class="cx"> PASS Range interface: detachedRange must inherit property "comparePoint" with the proper type (28)
</span><del>-FAIL Range interface: calling comparePoint(Node,unsigned long) on detachedRange with too few arguments must throw TypeError assert_throws: Called with 1 arguments function "function () {
- fn.apply(obj, args);
- }" threw object "WrongDocumentError (DOM Exception 4): The object is in th..." ("WrongDocumentError") expected object "TypeError" ("TypeError")
</del><ins>+PASS Range interface: calling comparePoint(Node,unsigned long) on detachedRange with too few arguments must throw TypeError
</ins><span class="cx"> PASS Range interface: detachedRange must inherit property "intersectsNode" with the proper type (29)
</span><span class="cx"> PASS Range interface: calling intersectsNode(Node) on detachedRange with too few arguments must throw TypeError
</span><span class="cx"> PASS NodeIterator interface: existence and properties of interface object
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/Source/WebCore/ChangeLog 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2016-07-26 Chris Dumez <cdumez@apple.com>
+
+ Second parameter to Range.isPointInRange() / comparePoint() should be mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=160202
+
+ Reviewed by Ryosuke Niwa.
+
+ Second parameter to Range.isPointInRange() / comparePoint() should be mandatory
+ and be of type "unsigned long":
+ - https://dom.spec.whatwg.org/#interface-range
+
+ Firefox and Chrome agree with the specification.
+
+ No new tests, rebaselined existing tests.
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::traverseToOffsetInRange):
+ * dom/DocumentMarkerController.cpp:
+ (WebCore::DocumentMarkerController::removeMarkers):
+ (WebCore::DocumentMarkerController::markersInRange):
+ (DocumentMarkerController::setMarkersActive):
+ * dom/Range.cpp:
+ (WebCore::Range::isPointInRange):
+ (WebCore::Range::comparePoint):
+ (WebCore::Range::compareBoundaryPoints):
+ (WebCore::Range::toString):
+ (WebCore::Range::absoluteTextRects):
+ (WebCore::Range::absoluteTextQuads):
+ (WebCore::boundaryTextNodesMerged):
+ (WebCore::Range::getBorderAndTextQuads):
+ * dom/Range.h:
+ (WebCore::Range::startOffset):
+ (WebCore::Range::endOffset):
+ * dom/Range.idl:
+ * dom/RangeBoundaryPoint.h:
+ (WebCore::RangeBoundaryPoint::ensureOffsetIsValid):
+ (WebCore::RangeBoundaryPoint::toPosition):
+ (WebCore::RangeBoundaryPoint::offset):
+ (WebCore::RangeBoundaryPoint::setOffset):
+ (WebCore::RangeBoundaryPoint::setToBeforeChild):
+ (WebCore::RangeBoundaryPoint::setToAfterChild):
+ (WebCore::RangeBoundaryPoint::setToEndOfNode):
+ (WebCore::RangeBoundaryPoint::childBeforeWillBeRemoved):
+ (WebCore::RangeBoundaryPoint::invalidateOffset):
+
</ins><span class="cx"> 2016-07-26 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Add support for fetch mode, in particular cors
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -1604,7 +1604,7 @@
</span><span class="cx">
</span><span class="cx"> // Sometimes when we are getting the end CharacterOffset of a line range, the TextIterator will emit an extra space at the end
</span><span class="cx"> // and make the character count greater than the Range's end offset.
</span><del>- if (toNodeEnd && currentNode->isTextNode() && currentNode == &range->endContainer() && range->endOffset() < lastStartOffset + offsetInCharacter)
</del><ins>+ if (toNodeEnd && currentNode->isTextNode() && currentNode == &range->endContainer() && static_cast<int>(range->endOffset()) < lastStartOffset + offsetInCharacter)
</ins><span class="cx"> offsetInCharacter = range->endOffset() - lastStartOffset;
</span><span class="cx">
</span><span class="cx"> return CharacterOffset(currentNode, lastStartOffset, offsetInCharacter, remaining);
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleUtilcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> Node* lastDescendant = node->lastDescendant();
</span><span class="cx"> return (range->intersectsNode(*node, IGNORE_EXCEPTION)
</span><span class="cx"> && (&range->endContainer() != node || range->endOffset())
</span><del>- && (&range->startContainer() != lastDescendant || range->startOffset() != lastOffsetInNode(lastDescendant)));
</del><ins>+ && (&range->startContainer() != lastDescendant || static_cast<int>(range->startOffset()) != lastOffsetInNode(lastDescendant)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentMarkerControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -142,8 +142,8 @@
</span><span class="cx"> ASSERT(!m_markers.isEmpty());
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> textPiece = markedText.range();
</span><del>- int startOffset = textPiece->startOffset();
- int endOffset = textPiece->endOffset();
</del><ins>+ unsigned startOffset = textPiece->startOffset();
+ unsigned endOffset = textPiece->endOffset();
</ins><span class="cx"> removeMarkers(&textPiece->startContainer(), startOffset, endOffset - startOffset, markerTypes, shouldRemovePartiallyOverlappingMarker);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -531,9 +531,9 @@
</span><span class="cx"> for (auto* marker : markersFor(node)) {
</span><span class="cx"> if (!markerTypes.contains(marker->type()))
</span><span class="cx"> continue;
</span><del>- if (node == &startContainer && marker->endOffset() <= static_cast<unsigned>(range->startOffset()))
</del><ins>+ if (node == &startContainer && marker->endOffset() <= range->startOffset())
</ins><span class="cx"> continue;
</span><del>- if (node == &endContainer && marker->startOffset() >= static_cast<unsigned>(range->endOffset()))
</del><ins>+ if (node == &endContainer && marker->startOffset() >= range->endOffset())
</ins><span class="cx"> continue;
</span><span class="cx"> foundMarkers.append(marker);
</span><span class="cx"> }
</span><span class="lines">@@ -701,8 +701,8 @@
</span><span class="cx"> Node* pastLastNode = range->pastLastNode();
</span><span class="cx">
</span><span class="cx"> for (Node* node = range->firstNode(); node != pastLastNode; node = NodeTraversal::next(*node)) {
</span><del>- int startOffset = node == &startContainer ? range->startOffset() : 0;
- int endOffset = node == &endContainer ? range->endOffset() : INT_MAX;
</del><ins>+ unsigned startOffset = node == &startContainer ? range->startOffset() : 0;
+ unsigned endOffset = node == &endContainer ? range->endOffset() : std::numeric_limits<unsigned>::max();
</ins><span class="cx"> setMarkersActive(node, startOffset, endOffset, active);
</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 (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/Source/WebCore/dom/Range.cpp 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -226,7 +226,7 @@
</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, unsigned offset, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (&refNode.document() != &ownerDocument()) {
</span><span class="cx"> return false;
</span><span class="lines">@@ -249,7 +249,7 @@
</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, unsigned 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="lines">@@ -367,7 +367,7 @@
</span><span class="cx"> return compareBoundaryPoints(static_cast<CompareHow>(compareHow), sourceRange, ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-short Range::compareBoundaryPoints(Node* containerA, int offsetA, Node* containerB, int offsetB, ExceptionCode& ec)
</del><ins>+short Range::compareBoundaryPoints(Node* containerA, unsigned offsetA, Node* containerB, unsigned offsetB, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(containerA);
</span><span class="cx"> ASSERT(containerB);
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> while (c && c->parentNode() != containerA)
</span><span class="cx"> c = c->parentNode();
</span><span class="cx"> if (c) {
</span><del>- int offsetC = 0;
</del><ins>+ unsigned offsetC = 0;
</ins><span class="cx"> Node* n = containerA->firstChild();
</span><span class="cx"> while (n != c && offsetC < offsetA) {
</span><span class="cx"> offsetC++;
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> while (c && c->parentNode() != containerB)
</span><span class="cx"> c = c->parentNode();
</span><span class="cx"> if (c) {
</span><del>- int offsetC = 0;
</del><ins>+ unsigned offsetC = 0;
</ins><span class="cx"> Node* n = containerB->firstChild();
</span><span class="cx"> while (n != c && offsetC < offsetB) {
</span><span class="cx"> offsetC++;
</span><span class="lines">@@ -869,9 +869,9 @@
</span><span class="cx"> for (Node* n = firstNode(); n != pastLast; n = NodeTraversal::next(*n)) {
</span><span class="cx"> if (n->nodeType() == Node::TEXT_NODE || n->nodeType() == Node::CDATA_SECTION_NODE) {
</span><span class="cx"> const String& data = static_cast<CharacterData*>(n)->data();
</span><del>- int length = data.length();
- int start = n == &startContainer() ? std::min(std::max(0, m_start.offset()), length) : 0;
- int end = n == &endContainer() ? std::min(std::max(start, m_end.offset()), length) : length;
</del><ins>+ unsigned length = data.length();
+ unsigned start = n == &startContainer() ? std::min(std::max(0U, m_start.offset()), length) : 0U;
+ unsigned end = n == &endContainer() ? std::min(std::max(start, m_end.offset()), length) : length;
</ins><span class="cx"> builder.append(data, start, end - start);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1149,8 +1149,8 @@
</span><span class="cx"> if (renderer->isBR())
</span><span class="cx"> renderer->absoluteRects(rects, flooredLayoutPoint(renderer->localToAbsolute()));
</span><span class="cx"> else if (is<RenderText>(*renderer)) {
</span><del>- int startOffset = node == &startContainer() ? m_start.offset() : 0;
- int endOffset = node == &endContainer() ? m_end.offset() : std::numeric_limits<int>::max();
</del><ins>+ unsigned startOffset = node == &startContainer() ? m_start.offset() : 0;
+ unsigned endOffset = node == &endContainer() ? m_end.offset() : std::numeric_limits<unsigned>::max();
</ins><span class="cx"> rects.appendVector(downcast<RenderText>(*renderer).absoluteRectsForRange(startOffset, endOffset, useSelectionHeight, &isFixed));
</span><span class="cx"> } else
</span><span class="cx"> continue;
</span><span class="lines">@@ -1176,8 +1176,8 @@
</span><span class="cx"> if (renderer->isBR())
</span><span class="cx"> renderer->absoluteQuads(quads, &isFixed);
</span><span class="cx"> else if (is<RenderText>(*renderer)) {
</span><del>- int startOffset = node == &startContainer() ? m_start.offset() : 0;
- int endOffset = node == &endContainer() ? m_end.offset() : std::numeric_limits<int>::max();
</del><ins>+ unsigned startOffset = node == &startContainer() ? m_start.offset() : 0;
+ unsigned endOffset = node == &endContainer() ? m_end.offset() : std::numeric_limits<unsigned>::max();
</ins><span class="cx"> quads.appendVector(downcast<RenderText>(*renderer).absoluteQuadsForRange(startOffset, endOffset, useSelectionHeight, &isFixed));
</span><span class="cx"> } else
</span><span class="cx"> continue;
</span><span class="lines">@@ -1644,7 +1644,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (boundary.container() == oldNode.node())
</span><span class="cx"> boundary.set(*oldNode.node()->previousSibling(), boundary.offset() + offset, 0);
</span><del>- else if (boundary.container() == oldNode.node()->parentNode() && boundary.offset() == oldNode.index())
</del><ins>+ else if (boundary.container() == oldNode.node()->parentNode() && static_cast<int>(boundary.offset()) == oldNode.index())
</ins><span class="cx"> boundary.set(*oldNode.node()->previousSibling(), offset, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1763,8 +1763,8 @@
</span><span class="cx"> }
</span><span class="cx"> } else if (is<Text>(*node)) {
</span><span class="cx"> if (RenderText* renderText = downcast<Text>(*node).renderer()) {
</span><del>- int startOffset = node == &startContainer() ? m_start.offset() : 0;
- int endOffset = node == &endContainer() ? m_end.offset() : INT_MAX;
</del><ins>+ unsigned startOffset = node == &startContainer() ? m_start.offset() : 0;
+ unsigned endOffset = node == &endContainer() ? m_end.offset() : std::numeric_limits<unsigned>::max();
</ins><span class="cx">
</span><span class="cx"> auto textQuads = renderText->absoluteQuadsForRange(startOffset, endOffset);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/Source/WebCore/dom/Range.h 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -59,9 +59,9 @@
</span><span class="cx"> Document& ownerDocument() const { return const_cast<Document&>(m_ownerDocument.get()); }
</span><span class="cx">
</span><span class="cx"> Node& startContainer() const { ASSERT(m_start.container()); return *m_start.container(); }
</span><del>- int startOffset() const { return m_start.offset(); }
</del><ins>+ unsigned startOffset() const { return m_start.offset(); }
</ins><span class="cx"> Node& endContainer() const { ASSERT(m_end.container()); return *m_end.container(); }
</span><del>- int endOffset() const { return m_end.offset(); }
</del><ins>+ unsigned endOffset() const { return m_end.offset(); }
</ins><span class="cx"> bool collapsed() const { return m_start == m_end; }
</span><span class="cx">
</span><span class="cx"> Node* commonAncestorContainer() const { return commonAncestorContainer(&startContainer(), &endContainer()); }
</span><span class="lines">@@ -69,14 +69,14 @@
</span><span class="cx"> WEBCORE_EXPORT void setStart(Ref<Node>&& container, unsigned offset, ExceptionCode& = ASSERT_NO_EXCEPTION);
</span><span class="cx"> WEBCORE_EXPORT void setEnd(Ref<Node>&& container, unsigned offset, ExceptionCode& = ASSERT_NO_EXCEPTION);
</span><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, unsigned offset, ExceptionCode&);
+ short comparePoint(Node& refNode, unsigned offset, ExceptionCode&) const;
</ins><span class="cx"> enum CompareResults { NODE_BEFORE, NODE_AFTER, NODE_BEFORE_AND_AFTER, NODE_INSIDE };
</span><span class="cx"> CompareResults compareNode(Node& refNode, ExceptionCode&) const;
</span><span class="cx"> enum CompareHow { START_TO_START, START_TO_END, END_TO_END, END_TO_START };
</span><span class="cx"> WEBCORE_EXPORT short compareBoundaryPoints(CompareHow, const Range& sourceRange, ExceptionCode&) const;
</span><span class="cx"> short compareBoundaryPointsForBindings(unsigned short compareHow, const Range& sourceRange, ExceptionCode&) const;
</span><del>- static short compareBoundaryPoints(Node* containerA, int offsetA, Node* containerB, int offsetB, ExceptionCode&);
</del><ins>+ static short compareBoundaryPoints(Node* containerA, unsigned offsetA, Node* containerB, unsigned offsetB, ExceptionCode&);
</ins><span class="cx"> static short compareBoundaryPoints(const RangeBoundaryPoint& boundaryA, const RangeBoundaryPoint& boundaryB, ExceptionCode&);
</span><span class="cx"> WEBCORE_EXPORT bool boundaryPointsValid() const;
</span><span class="cx"> bool intersectsNode(Node& refNode, ExceptionCode&) const;
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.idl (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.idl 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/Source/WebCore/dom/Range.idl 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -89,10 +89,16 @@
</span><span class="cx"> const unsigned short NODE_BEFORE_AND_AFTER = 2;
</span><span class="cx"> const unsigned short NODE_INSIDE = 3;
</span><span class="cx">
</span><del>- [RaisesException] short comparePoint(Node refNode, optional long offset = 0);
</del><span class="cx"> [RaisesException] boolean intersectsNode(Node refNode);
</span><del>- [RaisesException] boolean isPointInRange(Node refNode, optional long offset = 0);
</del><span class="cx">
</span><ins>+#if defined(LANGUAGE_JAVASCRIPT) || LANGUAGE_JAVASCRIPT
+ [RaisesException] short comparePoint(Node refNode, unsigned long offset);
+ [RaisesException] boolean isPointInRange(Node refNode, unsigned long offset);
+#else
+ [RaisesException] short comparePoint(Node refNode, long offset);
+ [RaisesException] boolean isPointInRange(Node refNode, long offset);
+#endif
+
</ins><span class="cx"> // FIXME: Using "undefined" as default parameter value is wrong.
</span><span class="cx"> [RaisesException] void expand(optional DOMString unit = "undefined");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeBoundaryPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/RangeBoundaryPoint.h (203732 => 203733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/RangeBoundaryPoint.h 2016-07-26 20:18:03 UTC (rev 203732)
+++ trunk/Source/WebCore/dom/RangeBoundaryPoint.h 2016-07-26 20:54:25 UTC (rev 203733)
</span><span class="lines">@@ -40,13 +40,13 @@
</span><span class="cx"> const Position toPosition() const;
</span><span class="cx">
</span><span class="cx"> Node* container() const;
</span><del>- int offset() const;
</del><ins>+ unsigned offset() const;
</ins><span class="cx"> Node* childBefore() const;
</span><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span><span class="cx"> void set(Ref<Node>&& container, unsigned offset, Node* childBefore);
</span><del>- void setOffset(int offset);
</del><ins>+ void setOffset(unsigned);
</ins><span class="cx">
</span><span class="cx"> void setToBeforeChild(Node&);
</span><span class="cx"> void setToAfterChild(Node&);
</span><span class="lines">@@ -58,10 +58,8 @@
</span><span class="cx"> void ensureOffsetIsValid() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static const int invalidOffset = -1;
-
</del><span class="cx"> RefPtr<Node> m_containerNode;
</span><del>- mutable int m_offsetInContainer { 0 };
</del><ins>+ mutable Optional<unsigned> m_offsetInContainer { 0 };
</ins><span class="cx"> RefPtr<Node> m_childBeforeBoundary;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -90,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> inline void RangeBoundaryPoint::ensureOffsetIsValid() const
</span><span class="cx"> {
</span><del>- if (m_offsetInContainer >= 0)
</del><ins>+ if (m_offsetInContainer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(m_childBeforeBoundary);
</span><span class="lines">@@ -100,13 +98,13 @@
</span><span class="cx"> inline const Position RangeBoundaryPoint::toPosition() const
</span><span class="cx"> {
</span><span class="cx"> ensureOffsetIsValid();
</span><del>- return createLegacyEditingPosition(m_containerNode.get(), m_offsetInContainer);
</del><ins>+ return createLegacyEditingPosition(m_containerNode.get(), m_offsetInContainer.value());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline int RangeBoundaryPoint::offset() const
</del><ins>+inline unsigned RangeBoundaryPoint::offset() const
</ins><span class="cx"> {
</span><span class="cx"> ensureOffsetIsValid();
</span><del>- return m_offsetInContainer;
</del><ins>+ return m_offsetInContainer.value();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void RangeBoundaryPoint::clear()
</span><span class="lines">@@ -124,11 +122,11 @@
</span><span class="cx"> m_childBeforeBoundary = childBefore;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void RangeBoundaryPoint::setOffset(int offset)
</del><ins>+inline void RangeBoundaryPoint::setOffset(unsigned offset)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_containerNode);
</span><span class="cx"> ASSERT(m_containerNode->offsetInCharacters());
</span><del>- ASSERT(m_offsetInContainer >= 0);
</del><ins>+ ASSERT(m_offsetInContainer);
</ins><span class="cx"> ASSERT(!m_childBeforeBoundary);
</span><span class="cx"> m_offsetInContainer = offset;
</span><span class="cx"> }
</span><span class="lines">@@ -138,7 +136,7 @@
</span><span class="cx"> ASSERT(child.parentNode());
</span><span class="cx"> m_childBeforeBoundary = child.previousSibling();
</span><span class="cx"> m_containerNode = child.parentNode();
</span><del>- m_offsetInContainer = m_childBeforeBoundary ? invalidOffset : 0;
</del><ins>+ m_offsetInContainer = m_childBeforeBoundary ? Nullopt : Optional<unsigned>(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void RangeBoundaryPoint::setToAfterChild(Node& child)
</span><span class="lines">@@ -146,7 +144,7 @@
</span><span class="cx"> ASSERT(child.parentNode());
</span><span class="cx"> m_childBeforeBoundary = &child;
</span><span class="cx"> m_containerNode = child.parentNode();
</span><del>- m_offsetInContainer = m_childBeforeBoundary ? invalidOffset : 0;
</del><ins>+ m_offsetInContainer = m_childBeforeBoundary ? Nullopt : Optional<unsigned>(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void RangeBoundaryPoint::setToStartOfNode(Ref<Node>&& container)
</span><span class="lines">@@ -164,23 +162,23 @@
</span><span class="cx"> m_childBeforeBoundary = nullptr;
</span><span class="cx"> } else {
</span><span class="cx"> m_childBeforeBoundary = m_containerNode->lastChild();
</span><del>- m_offsetInContainer = m_childBeforeBoundary ? invalidOffset : 0;
</del><ins>+ m_offsetInContainer = m_childBeforeBoundary ? Nullopt : Optional<unsigned>(0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void RangeBoundaryPoint::childBeforeWillBeRemoved()
</span><span class="cx"> {
</span><del>- ASSERT(m_offsetInContainer);
</del><ins>+ ASSERT(!m_offsetInContainer || m_offsetInContainer.value());
</ins><span class="cx"> m_childBeforeBoundary = m_childBeforeBoundary->previousSibling();
</span><span class="cx"> if (!m_childBeforeBoundary)
</span><span class="cx"> m_offsetInContainer = 0;
</span><del>- else if (m_offsetInContainer > 0)
- --m_offsetInContainer;
</del><ins>+ else if (m_offsetInContainer && m_offsetInContainer.value() > 0)
+ --(m_offsetInContainer.value());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void RangeBoundaryPoint::invalidateOffset() const
</span><span class="cx"> {
</span><del>- m_offsetInContainer = invalidOffset;
</del><ins>+ m_offsetInContainer = Nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool operator==(const RangeBoundaryPoint& a, const RangeBoundaryPoint& b)
</span></span></pre>
</div>
</div>
</body>
</html>