<!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>[189062] 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/189062">189062</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-08-27 15:33:40 -0700 (Thu, 27 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Range.compareBoundaryPoints() should throw a NotSupportedError for invalid compareHow values
https://bugs.webkit.org/show_bug.cgi?id=148483
Reviewed by Geoffrey Garen.
Source/WebCore:
Range.compareBoundaryPoints() should throw a NotSupportedError for
invalid compareHow values:
https://dom.spec.whatwg.org/#dom-range-compareboundarypoints (step 1)
Firefox and Chrome conform to the specification already.
Previously, WebKit would not throw and simply cast the value to our
internal CompareHow enum type. This patch aligns WebKit's behavior with
the DOM specificaiton and other browsers.
W3C test suite:
http://w3c-test.org/dom/ranges/Range-compareBoundaryPoints.html
Test: fast/dom/Range/compareBoundaryPoints-compareHow-exception.html
* bindings/scripts/CodeGenerator.pm:
* bindings/scripts/CodeGeneratorGObject.pm:
* bindings/scripts/CodeGeneratorJS.pm:
* bindings/scripts/CodeGeneratorObjC.pm:
Drop CompareHow special casing from bindings generator as we now use
unsigned short instead in the IDL.
* dom/Range.cpp:
(WebCore::Range::compareBoundaryPointsForBindings):
* dom/Range.h:
* dom/Range.idl:
Use "unsigned short" type instead of WebCore's CompareHow for the
parameter, as per the specification. On implementation side, we
now validate the compareHow value before casting it to a CompareHow
enum type. If the value is not value, we throw and abort early.
LayoutTests:
Add new layout test to confirm that Range.compareBoundaryPoints() throws
when passed in invalid compareHow values.
* fast/dom/Range/compareBoundaryPoints-compareHow-exception-expected.txt: Added.
* fast/dom/Range/compareBoundaryPoints-compareHow-exception.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorpm">trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomRangecompareBoundaryPointscompareHowexceptionexpectedtxt">trunk/LayoutTests/fast/dom/Range/compareBoundaryPoints-compareHow-exception-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomRangecompareBoundaryPointscompareHowexceptionhtml">trunk/LayoutTests/fast/dom/Range/compareBoundaryPoints-compareHow-exception.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189061 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-27 22:31:04 UTC (rev 189061)
+++ trunk/LayoutTests/ChangeLog 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-27 Chris Dumez <cdumez@apple.com>
+
+ Range.compareBoundaryPoints() should throw a NotSupportedError for invalid compareHow values
+ https://bugs.webkit.org/show_bug.cgi?id=148483
+
+ Reviewed by Geoffrey Garen.
+
+ Add new layout test to confirm that Range.compareBoundaryPoints() throws
+ when passed in invalid compareHow values.
+
+ * fast/dom/Range/compareBoundaryPoints-compareHow-exception-expected.txt: Added.
+ * fast/dom/Range/compareBoundaryPoints-compareHow-exception.html: Added.
+
</ins><span class="cx"> 2015-08-27 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Page does not update when <link> media attribute changes to no longer apply to page
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomRangecompareBoundaryPointscompareHowexceptionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Range/compareBoundaryPoints-compareHow-exception-expected.txt (0 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Range/compareBoundaryPoints-compareHow-exception-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/Range/compareBoundaryPoints-compareHow-exception-expected.txt 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Checks that Range.compareBoundaryPoints() throw if the compareHow parameter is invalid
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS range.compareBoundaryPoints(Range.START_TO_START, sourceRange) is -1
+PASS range.compareBoundaryPoints(Range.START_TO_END, sourceRange) is -1
+PASS range.compareBoundaryPoints(Range.END_TO_END, sourceRange) is -1
+PASS range.compareBoundaryPoints(Range.END_TO_START, sourceRange) is -1
+PASS range.compareBoundaryPoints(65536, sourceRange) is -1
+PASS range.compareBoundaryPoints(-1, sourceRange) threw exception Error: NotSupportedError: DOM Exception 9.
+PASS range.compareBoundaryPoints(4, sourceRange) threw exception Error: NotSupportedError: DOM Exception 9.
+PASS range.compareBoundaryPoints(100, sourceRange) threw exception Error: NotSupportedError: DOM Exception 9.
+PASS range.compareBoundaryPoints(65535, sourceRange) threw exception Error: NotSupportedError: DOM Exception 9.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomRangecompareBoundaryPointscompareHowexceptionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Range/compareBoundaryPoints-compareHow-exception.html (0 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Range/compareBoundaryPoints-compareHow-exception.html (rev 0)
+++ trunk/LayoutTests/fast/dom/Range/compareBoundaryPoints-compareHow-exception.html 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<div></div>
+<div></div>
+<script src="../../../resources/js-test-pre.js"></script>
+<script>
+description("Checks that Range.compareBoundaryPoints() throw if the compareHow parameter is invalid");
+
+var range = document.createRange();
+range.selectNode(document.getElementsByTagName("div")[0]);
+var sourceRange = document.createRange();
+sourceRange.selectNode(document.getElementsByTagName("div")[1]);
+
+// Valid values.
+shouldBe("range.compareBoundaryPoints(Range.START_TO_START, sourceRange)", "-1");
+shouldBe("range.compareBoundaryPoints(Range.START_TO_END, sourceRange)", "-1");
+shouldBe("range.compareBoundaryPoints(Range.END_TO_END, sourceRange)", "-1");
+shouldBe("range.compareBoundaryPoints(Range.END_TO_START, sourceRange)", "-1");
+shouldBe("range.compareBoundaryPoints(65536, sourceRange)", "-1"); // 65536 should wrap around to 0.
+
+// Invalid values.
+shouldThrow("range.compareBoundaryPoints(-1, sourceRange)", "'Error: NotSupportedError: DOM Exception 9'");
+shouldThrow("range.compareBoundaryPoints(4, sourceRange)", "'Error: NotSupportedError: DOM Exception 9'");
+shouldThrow("range.compareBoundaryPoints(100, sourceRange)", "'Error: NotSupportedError: DOM Exception 9'");
+shouldThrow("range.compareBoundaryPoints(65535, sourceRange)", "'Error: NotSupportedError: DOM Exception 9'");
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189061 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-27 22:31:04 UTC (rev 189061)
+++ trunk/Source/WebCore/ChangeLog 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-08-27 Chris Dumez <cdumez@apple.com>
+
+ Range.compareBoundaryPoints() should throw a NotSupportedError for invalid compareHow values
+ https://bugs.webkit.org/show_bug.cgi?id=148483
+
+ Reviewed by Geoffrey Garen.
+
+ Range.compareBoundaryPoints() should throw a NotSupportedError for
+ invalid compareHow values:
+ https://dom.spec.whatwg.org/#dom-range-compareboundarypoints (step 1)
+
+ Firefox and Chrome conform to the specification already.
+
+ Previously, WebKit would not throw and simply cast the value to our
+ internal CompareHow enum type. This patch aligns WebKit's behavior with
+ the DOM specificaiton and other browsers.
+
+ W3C test suite:
+ http://w3c-test.org/dom/ranges/Range-compareBoundaryPoints.html
+
+ Test: fast/dom/Range/compareBoundaryPoints-compareHow-exception.html
+
+ * bindings/scripts/CodeGenerator.pm:
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ Drop CompareHow special casing from bindings generator as we now use
+ unsigned short instead in the IDL.
+
+ * dom/Range.cpp:
+ (WebCore::Range::compareBoundaryPointsForBindings):
+ * dom/Range.h:
+ * dom/Range.idl:
+ Use "unsigned short" type instead of WebCore's CompareHow for the
+ parameter, as per the specification. On implementation side, we
+ now validate the compareHow value before casting it to a CompareHow
+ enum type. If the value is not value, we throw and abort early.
+
</ins><span class="cx"> 2015-08-27 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Page does not update when <link> media attribute changes to no longer apply to page
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (189061 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2015-08-27 22:31:04 UTC (rev 189061)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -57,14 +57,13 @@
</span><span class="cx">
</span><span class="cx"> # WebCore types used directly in IDL files.
</span><span class="cx"> my %webCoreTypeHash = (
</span><del>- "CompareHow" => 1,
</del><span class="cx"> "SerializedScriptValue" => 1,
</span><span class="cx"> "Dictionary" => 1
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> my %enumTypeHash = ();
</span><span class="cx">
</span><del>-my %nonPointerTypeHash = ("DOMTimeStamp" => 1, "CompareHow" => 1);
</del><ins>+my %nonPointerTypeHash = ("DOMTimeStamp" => 1);
</ins><span class="cx">
</span><span class="cx"> my %svgAttributesInHTMLHash = ("class" => 1, "id" => 1, "onabort" => 1, "onclick" => 1,
</span><span class="cx"> "onerror" => 1, "onload" => 1, "onmousedown" => 1,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (189061 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2015-08-27 22:31:04 UTC (rev 189061)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -411,7 +411,6 @@
</span><span class="cx">
</span><span class="cx"> my %types = ("DOMString", "gchar*",
</span><span class="cx"> "DOMTimeStamp", "guint32",
</span><del>- "CompareHow", "gushort",
</del><span class="cx"> "SerializedScriptValue", "gchar*",
</span><span class="cx"> "float", "gfloat",
</span><span class="cx"> "unrestricted float", "gfloat",
</span><span class="lines">@@ -1066,7 +1065,7 @@
</span><span class="cx"> $implIncludes{"WebKitDOM${paramIDLType}Private.h"} = 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if ($paramIsGDOMType || ($paramIDLType eq "DOMString") || ($paramIDLType eq "CompareHow")) {
</del><ins>+ if ($paramIsGDOMType || ($paramIDLType eq "DOMString")) {
</ins><span class="cx"> $paramName = "converted" . $codeGenerator->WK_ucfirst($paramName);
</span><span class="cx"> }
</span><span class="cx"> if ($paramIDLType eq "NodeFilter" || $paramIDLType eq "XPathNSResolver") {
</span><span class="lines">@@ -1188,8 +1187,6 @@
</span><span class="cx"> $convertedParamName = "converted" . $codeGenerator->WK_ucfirst($paramName);
</span><span class="cx"> if ($paramIDLType eq "DOMString") {
</span><span class="cx"> push(@cBody, " WTF::String ${convertedParamName} = WTF::String::fromUTF8($paramName);\n");
</span><del>- } elsif ($paramIDLType eq "CompareHow") {
- push(@cBody, " WebCore::Range::CompareHow ${convertedParamName} = static_cast<WebCore::Range::CompareHow>($paramName);\n");
</del><span class="cx"> } elsif ($paramIDLType eq "NodeFilter" || $paramIDLType eq "XPathNSResolver") {
</span><span class="cx"> push(@cBody, " RefPtr<WebCore::$paramIDLType> ${convertedParamName} = WebKit::core($paramName);\n");
</span><span class="cx"> } elsif ($paramIsGDOMType) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (189061 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-08-27 22:31:04 UTC (rev 189061)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -3740,7 +3740,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my %nativeType = (
</span><del>- "CompareHow" => "Range::CompareHow",
</del><span class="cx"> "DOMString" => "String",
</span><span class="cx"> "NodeFilter" => "RefPtr<NodeFilter>",
</span><span class="cx"> "SerializedScriptValue" => "RefPtr<SerializedScriptValue>",
</span><span class="lines">@@ -3880,7 +3879,6 @@
</span><span class="cx"> return "toUInt64(exec, $value, $intConversion)" if $type eq "unsigned long long";
</span><span class="cx">
</span><span class="cx"> return "valueToDate(exec, $value)" if $type eq "Date";
</span><del>- return "static_cast<Range::CompareHow>($value.toInt32(exec))" if $type eq "CompareHow";
</del><span class="cx">
</span><span class="cx"> if ($type eq "DOMString") {
</span><span class="cx"> # FIXME: This implements [TreatNullAs=NullString] and [TreatUndefinedAs=NullString],
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (189061 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-08-27 22:31:04 UTC (rev 189061)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -577,7 +577,6 @@
</span><span class="cx"> return "float" if $type eq "unrestricted float";
</span><span class="cx"> return "id <$name>" if IsProtocolType($type);
</span><span class="cx"> return $name if $codeGenerator->IsPrimitiveType($type) or $type eq "DOMTimeStamp";
</span><del>- return "unsigned short" if $type eq "CompareHow";
</del><span class="cx"> return $name if IsCoreFoundationType($name);
</span><span class="cx"> return "$name *";
</span><span class="cx"> }
</span><span class="lines">@@ -594,7 +593,7 @@
</span><span class="cx"> # FIXME: <rdar://problem/5049934> Consider using 'nonatomic' on the DOM @property declarations.
</span><span class="cx"> if ($codeGenerator->IsStringType($type) || IsNativeObjCType($type)) {
</span><span class="cx"> push(@attributes, "copy");
</span><del>- } elsif (!$codeGenerator->IsStringType($type) && !$codeGenerator->IsPrimitiveType($type) && $type ne "DOMTimeStamp" && $type ne "CompareHow") {
</del><ins>+ } elsif (!$codeGenerator->IsStringType($type) && !$codeGenerator->IsPrimitiveType($type) && $type ne "DOMTimeStamp") {
</ins><span class="cx"> push(@attributes, "strong");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -616,7 +615,6 @@
</span><span class="cx">
</span><span class="cx"> return $argName if $codeGenerator->IsPrimitiveType($type) or $codeGenerator->IsStringType($type) or IsNativeObjCType($type);
</span><span class="cx"> return $argName . "Node" if $type eq "EventTarget";
</span><del>- return "static_cast<WebCore::Range::CompareHow>($argName)" if $type eq "CompareHow";
</del><span class="cx"> return "WTF::getPtr(nativeEventListener)" if $type eq "EventListener";
</span><span class="cx"> return "WTF::getPtr(nativeNodeFilter)" if $type eq "NodeFilter";
</span><span class="cx"> return "WTF::getPtr(nativeResolver)" if $type eq "XPathNSResolver";
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (189061 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2015-08-27 22:31:04 UTC (rev 189061)
+++ trunk/Source/WebCore/dom/Range.cpp 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -462,6 +462,15 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+short Range::compareBoundaryPointsForBindings(unsigned short compareHow, const Range* sourceRange, ExceptionCode& ec) const
+{
+ if (compareHow > END_TO_START) {
+ ec = NOT_SUPPORTED_ERR;
+ return 0;
+ }
+ return compareBoundaryPoints(static_cast<CompareHow>(compareHow), sourceRange, ec);
+}
+
</ins><span class="cx"> short Range::compareBoundaryPoints(Node* containerA, int offsetA, Node* containerB, int offsetB, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(containerA);
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (189061 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2015-08-27 22:31:04 UTC (rev 189061)
+++ trunk/Source/WebCore/dom/Range.h 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -80,6 +80,7 @@
</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><ins>+ 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></span></pre></div>
<a id="trunkSourceWebCoredomRangeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.idl (189061 => 189062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.idl 2015-08-27 22:31:04 UTC (rev 189061)
+++ trunk/Source/WebCore/dom/Range.idl 2015-08-27 22:33:40 UTC (rev 189062)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> const unsigned short END_TO_END = 2;
</span><span class="cx"> const unsigned short END_TO_START = 3;
</span><span class="cx">
</span><del>- [ObjCLegacyUnnamedParameters, RaisesException] short compareBoundaryPoints([Default=Undefined] optional CompareHow how,
</del><ins>+ [ObjCLegacyUnnamedParameters, RaisesException, ImplementedAs=compareBoundaryPointsForBindings] short compareBoundaryPoints([Default=Undefined] optional unsigned short how,
</ins><span class="cx"> [Default=Undefined] optional Range sourceRange);
</span><span class="cx">
</span><span class="cx"> [RaisesException] void deleteContents();
</span></span></pre>
</div>
</div>
</body>
</html>