<!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>[186803] 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/186803">186803</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-07-14 08:58:05 -0700 (Tue, 14 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>DOM4: prepend, append, before, after & replace
https://bugs.webkit.org/show_bug.cgi?id=74648
Reviewed by Darin Adler.
Source/WebCore:
- Adds support for ChildNode.before/after/replaceWith and ParentNode.prepend/append
which are new functions in https://dom.spec.whatwg.org
- Uses custom bindings rather than implementing support for union types in the code
generator as their uses seems isolated to just this spec at the moment. If more
uses come along, we should implement proper support for them in the generator and
remove the custom bindings added here.
Tests: fast/dom/ChildNode-after.html
fast/dom/ChildNode-before.html
fast/dom/ChildNode-replaceWith.html
fast/dom/ParentNode-append.html
fast/dom/ParentNode-prepend.html
* CMakeLists.txt:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSBindingsAllInOne.cpp:
Add new files.
* bindings/js/JSCharacterDataCustom.cpp: Added.
(WebCore::JSCharacterData::before):
(WebCore::JSCharacterData::after):
(WebCore::JSCharacterData::replaceWith):
* bindings/js/JSDocumentCustom.cpp:
(WebCore::JSDocument::prepend):
(WebCore::JSDocument::append):
(WebCore::JSDocument::createTouchList):
* bindings/js/JSDocumentFragmentCustom.cpp: Added.
(WebCore::JSDocumentFragment::prepend):
(WebCore::JSDocumentFragment::append):
* bindings/js/JSDocumentTypeCustom.cpp: Added.
(WebCore::JSDocumentType::before):
(WebCore::JSDocumentType::after):
(WebCore::JSDocumentType::replaceWith):
* bindings/js/JSElementCustom.cpp:
(WebCore::toJSNewlyCreated):
(WebCore::JSElement::before):
(WebCore::JSElement::after):
(WebCore::JSElement::replaceWith):
(WebCore::JSElement::prepend):
(WebCore::JSElement::append):
Add custom bindings to implement the use of variadic union types.
* bindings/js/JSNodeOrString.cpp: Added.
(WebCore::toNodeOrStringVector):
* bindings/js/JSNodeOrString.h: Added.
Adds a help function for converting an JS argument list into a Vector
of NodeOrString objects.
* dom/ChildNode.idl:
Expose before/after/replaceWith to JavaScript.
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::append):
(WebCore::ContainerNode::prepend):
* dom/ContainerNode.h:
Add implementations of append and prepend.
* dom/Node.h:
* dom/Node.cpp:
(WebCore::nodeSetPreTransformedFromNodeOrStringVector):
(WebCore::firstPrecedingSiblingNotInNodeSet):
(WebCore::firstFollowingSiblingNotInNodeSet):
Helper functions for before, after and removeWith.
(WebCore::Node::before):
(WebCore::Node::after):
(WebCore::Node::replaceWith):
Add implementations of before, after and removeWith.
* dom/NodeOrString.cpp: Added.
(WebCore::convertNodesOrStringsIntoNode):
* dom/NodeOrString.h: Added.
(WebCore::NodeOrString::NodeOrString):
(WebCore::NodeOrString::~NodeOrString):
(WebCore::NodeOrString::type):
(WebCore::NodeOrString::node):
(WebCore::NodeOrString::string):
Custom union type representing the (Node or DOMString) IDL type.
* dom/ParentNode.idl:
Expose append/prepend to JavaScript.
LayoutTests:
* fast/dom/ChildNode-after-expected.txt: Added.
* fast/dom/ChildNode-after.html: Added.
* fast/dom/ChildNode-before-expected.txt: Added.
* fast/dom/ChildNode-before.html: Added.
* fast/dom/ChildNode-replaceWith-expected.txt: Added.
* fast/dom/ChildNode-replaceWith.html: Added.
* fast/dom/ParentNode-append-expected.txt: Added.
* fast/dom/ParentNode-append.html: Added.
* fast/dom/ParentNode-prepend-expected.txt: Added.
* fast/dom/ParentNode-prepend.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp">trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSElementCustomcpp">trunk/Source/WebCore/bindings/js/JSElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoredomChildNodeidl">trunk/Source/WebCore/dom/ChildNode.idl</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeh">trunk/Source/WebCore/dom/ContainerNode.h</a></li>
<li><a href="#trunkSourceWebCoredomDOMAllInOnecpp">trunk/Source/WebCore/dom/DOMAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredomParentNodeidl">trunk/Source/WebCore/dom/ParentNode.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomChildNodeafterexpectedtxt">trunk/LayoutTests/fast/dom/ChildNode-after-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomChildNodeafterhtml">trunk/LayoutTests/fast/dom/ChildNode-after.html</a></li>
<li><a href="#trunkLayoutTestsfastdomChildNodebeforeexpectedtxt">trunk/LayoutTests/fast/dom/ChildNode-before-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomChildNodebeforehtml">trunk/LayoutTests/fast/dom/ChildNode-before.html</a></li>
<li><a href="#trunkLayoutTestsfastdomChildNodereplaceWithexpectedtxt">trunk/LayoutTests/fast/dom/ChildNode-replaceWith-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomChildNodereplaceWithhtml">trunk/LayoutTests/fast/dom/ChildNode-replaceWith.html</a></li>
<li><a href="#trunkLayoutTestsfastdomParentNodeappendexpectedtxt">trunk/LayoutTests/fast/dom/ParentNode-append-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomParentNodeappendhtml">trunk/LayoutTests/fast/dom/ParentNode-append.html</a></li>
<li><a href="#trunkLayoutTestsfastdomParentNodeprependexpectedtxt">trunk/LayoutTests/fast/dom/ParentNode-prepend-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomParentNodeprependhtml">trunk/LayoutTests/fast/dom/ParentNode-prepend.html</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCharacterDataCustomcpp">trunk/Source/WebCore/bindings/js/JSCharacterDataCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentFragmentCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentTypeCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentTypeCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeOrStringcpp">trunk/Source/WebCore/bindings/js/JSNodeOrString.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeOrStringh">trunk/Source/WebCore/bindings/js/JSNodeOrString.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeOrStringcpp">trunk/Source/WebCore/dom/NodeOrString.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeOrStringh">trunk/Source/WebCore/dom/NodeOrString.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/LayoutTests/ChangeLog 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-07-05 Sam Weinig <sam@webkit.org>
+
+ DOM4: prepend, append, before, after & replace
+ https://bugs.webkit.org/show_bug.cgi?id=74648
+
+ Reviewed by Darin Adler.
+
+ * fast/dom/ChildNode-after-expected.txt: Added.
+ * fast/dom/ChildNode-after.html: Added.
+ * fast/dom/ChildNode-before-expected.txt: Added.
+ * fast/dom/ChildNode-before.html: Added.
+ * fast/dom/ChildNode-replaceWith-expected.txt: Added.
+ * fast/dom/ChildNode-replaceWith.html: Added.
+ * fast/dom/ParentNode-append-expected.txt: Added.
+ * fast/dom/ParentNode-append.html: Added.
+ * fast/dom/ParentNode-prepend-expected.txt: Added.
+ * fast/dom/ParentNode-prepend.html: Added.
+
</ins><span class="cx"> 2015-07-13 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> Object cycles should not prevent allocation elimination/sinking
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomChildNodeafterexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/ChildNode-after-expected.txt (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ChildNode-after-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/ChildNode-after-expected.txt 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,189 @@
</span><ins>+Tests ChildNode.after((Node or DOMString)...)
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Test Element.after((Node or DOMString)...).
+Test with no arguments.
+PASS parent.childNodes.length is 1
+
+Test with a single element.
+PASS parent.childNodes.length is 2
+PASS child.nextSibling is d1
+
+Test with a single string.
+PASS parent.childNodes.length is 2
+PASS child.nextSibling.data is 'hello'
+
+Test with a both strings and elements.
+PASS parent.childNodes.length is 3
+PASS child.nextSibling.data is 'hello'
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d1
+
+Test conversion to string
+PASS parent.childNodes.length is 4
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'null'
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is 'undefined'
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is '7'
+
+Test a child without a parent.
+PASS child.nextSibling is null
+
+Test when there the next sibling is not a viable next sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d1
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is 'world'
+PASS parent.childNodes[4] is an instance of Element
+PASS parent.childNodes[4] is d2
+
+Test when there is no viable next sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d1
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is 'world'
+PASS parent.childNodes[4] is an instance of Element
+PASS parent.childNodes[4] is d2
+
+Test Text.after((Node or DOMString)...).
+Test with no arguments.
+PASS parent.childNodes.length is 1
+
+Test with a single element.
+PASS parent.childNodes.length is 2
+PASS child.nextSibling is d1
+
+Test with a single string.
+PASS parent.childNodes.length is 2
+PASS child.nextSibling.data is 'hello'
+
+Test with a both strings and elements.
+PASS parent.childNodes.length is 3
+PASS child.nextSibling.data is 'hello'
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d1
+
+Test conversion to string
+PASS parent.childNodes.length is 4
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'null'
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is 'undefined'
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is '7'
+
+Test a child without a parent.
+PASS child.nextSibling is null
+
+Test when there the next sibling is not a viable next sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d1
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is 'world'
+PASS parent.childNodes[4] is an instance of Element
+PASS parent.childNodes[4] is d2
+
+Test when there is no viable next sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d1
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is 'world'
+PASS parent.childNodes[4] is an instance of Element
+PASS parent.childNodes[4] is d2
+
+Test Comment.after((Node or DOMString)...).
+Test with no arguments.
+PASS parent.childNodes.length is 1
+
+Test with a single element.
+PASS parent.childNodes.length is 2
+PASS child.nextSibling is d1
+
+Test with a single string.
+PASS parent.childNodes.length is 2
+PASS child.nextSibling.data is 'hello'
+
+Test with a both strings and elements.
+PASS parent.childNodes.length is 3
+PASS child.nextSibling.data is 'hello'
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d1
+
+Test conversion to string
+PASS parent.childNodes.length is 4
+PASS parent.childNodes[0] is an instance of Comment
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'null'
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is 'undefined'
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is '7'
+
+Test a child without a parent.
+PASS child.nextSibling is null
+
+Test when there the next sibling is not a viable next sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Comment
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d1
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is 'world'
+PASS parent.childNodes[4] is an instance of Element
+PASS parent.childNodes[4] is d2
+
+Test when there is no viable next sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Comment
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d1
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is 'world'
+PASS parent.childNodes[4] is an instance of Element
+PASS parent.childNodes[4] is d2
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomChildNodeafterhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/ChildNode-after.html (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ChildNode-after.html (rev 0)
+++ trunk/LayoutTests/fast/dom/ChildNode-after.html 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,133 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+
+description("Tests ChildNode.after((Node or DOMString)...)");
+function test(t, createChild)
+{
+ type = t;
+ debug("<b>Test " + type + ".after((Node or DOMString)...).</b>");
+
+ debug("Test with no arguments.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ child.after();
+ shouldBe("parent.childNodes.length", "1");
+ debug("");
+
+ debug("Test with a single element.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ child.after(d1);
+ shouldBe("parent.childNodes.length", "2");
+ shouldBe("child.nextSibling", "d1");
+ debug("");
+
+ debug("Test with a single string.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ child.after('hello');
+ shouldBe("parent.childNodes.length", "2");
+ shouldBe("child.nextSibling.data", "'hello'");
+ debug("");
+
+ debug("Test with a both strings and elements.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ child.after('hello', d1);
+ shouldBe("parent.childNodes.length", "3");
+ shouldBe("child.nextSibling.data", "'hello'");
+ shouldBeType("parent.childNodes[1]", "Text");
+ shouldBe("parent.childNodes[1].data", "'hello'");
+ shouldBeType("parent.childNodes[2]", "Element");
+ shouldBe("parent.childNodes[2]", "d1");
+ debug("");
+
+ debug("Test conversion to string");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ child.after(null, undefined, 7);
+ shouldBe("parent.childNodes.length", "4");
+ shouldBeType("parent.childNodes[0]", type);
+ shouldBe("parent.childNodes[0]", "child");
+ shouldBeType("parent.childNodes[1]", "Text");
+ shouldBe("parent.childNodes[1].data", "'null'");
+ shouldBeType("parent.childNodes[2]", "Text");
+ shouldBe("parent.childNodes[2].data", "'undefined'");
+ shouldBeType("parent.childNodes[3]", "Text");
+ shouldBe("parent.childNodes[3].data", "'7'");
+ debug("");
+
+ debug("Test a child without a parent.");
+ child = createChild();
+ d1 = document.createElement("div");
+ child.after(d1);
+ shouldBeNull("child.nextSibling");
+ debug("");
+
+ debug("Test when there the next sibling is not a viable next sibling.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ parent.appendChild(d1);
+ d2 = document.createElement("div");
+ parent.appendChild(d2);
+ child.after("hello", d1, "world");
+ shouldBe("parent.childNodes.length", "5");
+ shouldBeType("parent.childNodes[0]", type);
+ shouldBe("parent.childNodes[0]", "child");
+ shouldBeType("parent.childNodes[1]", "Text");
+ shouldBe("parent.childNodes[1].data", "'hello'");
+ shouldBeType("parent.childNodes[2]", "Element");
+ shouldBe("parent.childNodes[2]", "d1");
+ shouldBeType("parent.childNodes[3]", "Text");
+ shouldBe("parent.childNodes[3].data", "'world'");
+ shouldBeType("parent.childNodes[4]", "Element");
+ shouldBe("parent.childNodes[4]", "d2");
+ debug("");
+
+ debug("Test when there is no viable next sibling.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ parent.appendChild(d1);
+ d2 = document.createElement("div");
+ parent.appendChild(d2);
+ child.after("hello", d1, "world", d2);
+ shouldBe("parent.childNodes.length", "5");
+ shouldBeType("parent.childNodes[0]", type);
+ shouldBe("parent.childNodes[0]", "child");
+ shouldBeType("parent.childNodes[1]", "Text");
+ shouldBe("parent.childNodes[1].data", "'hello'");
+ shouldBeType("parent.childNodes[2]", "Element");
+ shouldBe("parent.childNodes[2]", "d1");
+ shouldBeType("parent.childNodes[3]", "Text");
+ shouldBe("parent.childNodes[3].data", "'world'");
+ shouldBeType("parent.childNodes[4]", "Element");
+ shouldBe("parent.childNodes[4]", "d2");
+
+ debug("");
+}
+
+test("Element", function() { return document.createElement("div"); });
+test("Text", function() { return document.createTextNode("text node text"); });
+test("Comment", function() { return document.createComment("comment text"); });
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomChildNodebeforeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/ChildNode-before-expected.txt (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ChildNode-before-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/ChildNode-before-expected.txt 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,189 @@
</span><ins>+Tests ChildNode.before((Node or DOMString)...)
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Test Element.before((Node or DOMString)...).
+Test with no arguments.
+PASS parent.childNodes.length is 1
+
+Test with a single element.
+PASS parent.childNodes.length is 2
+PASS child.previousSibling is d1
+
+Test with a single string.
+PASS parent.childNodes.length is 2
+PASS child.previousSibling.data is 'hello'
+
+Test with a both strings and elements.
+PASS parent.childNodes.length is 3
+PASS child.previousSibling is d1
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'hello'
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+
+Test conversion to string
+PASS parent.childNodes.length is 4
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'null'
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'undefined'
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is '7'
+PASS parent.childNodes[3] is an instance of Element
+PASS parent.childNodes[3] is child
+
+Test a child without a parent.
+PASS child.previousSibling is null
+
+Test when there the previous sibling is not a viable previous sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is d1
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d2
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is 'world'
+PASS parent.childNodes[4] is an instance of Element
+PASS parent.childNodes[4] is child
+
+Test when there is no viable previous sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'hello'
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is 'world'
+PASS parent.childNodes[3] is an instance of Element
+PASS parent.childNodes[3] is d2
+PASS parent.childNodes[4] is an instance of Element
+PASS parent.childNodes[4] is child
+
+Test Text.before((Node or DOMString)...).
+Test with no arguments.
+PASS parent.childNodes.length is 1
+
+Test with a single element.
+PASS parent.childNodes.length is 2
+PASS child.previousSibling is d1
+
+Test with a single string.
+PASS parent.childNodes.length is 2
+PASS child.previousSibling.data is 'hello'
+
+Test with a both strings and elements.
+PASS parent.childNodes.length is 3
+PASS child.previousSibling is d1
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'hello'
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+
+Test conversion to string
+PASS parent.childNodes.length is 4
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'null'
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'undefined'
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is '7'
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3] is child
+
+Test a child without a parent.
+PASS child.previousSibling is null
+
+Test when there the previous sibling is not a viable previous sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is d1
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d2
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is 'world'
+PASS parent.childNodes[4] is an instance of Text
+PASS parent.childNodes[4] is child
+
+Test when there is no viable previous sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'hello'
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is 'world'
+PASS parent.childNodes[3] is an instance of Element
+PASS parent.childNodes[3] is d2
+PASS parent.childNodes[4] is an instance of Text
+PASS parent.childNodes[4] is child
+
+Test Comment.before((Node or DOMString)...).
+Test with no arguments.
+PASS parent.childNodes.length is 1
+
+Test with a single element.
+PASS parent.childNodes.length is 2
+PASS child.previousSibling is d1
+
+Test with a single string.
+PASS parent.childNodes.length is 2
+PASS child.previousSibling.data is 'hello'
+
+Test with a both strings and elements.
+PASS parent.childNodes.length is 3
+PASS child.previousSibling is d1
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'hello'
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+
+Test conversion to string
+PASS parent.childNodes.length is 4
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'null'
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'undefined'
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is '7'
+PASS parent.childNodes[3] is an instance of Comment
+PASS parent.childNodes[3] is child
+
+Test a child without a parent.
+PASS child.previousSibling is null
+
+Test when there the previous sibling is not a viable previous sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is d1
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'hello'
+PASS parent.childNodes[2] is an instance of Element
+PASS parent.childNodes[2] is d2
+PASS parent.childNodes[3] is an instance of Text
+PASS parent.childNodes[3].data is 'world'
+PASS parent.childNodes[4] is an instance of Comment
+PASS parent.childNodes[4] is child
+
+Test when there is no viable previous sibling.
+PASS parent.childNodes.length is 5
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'hello'
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is 'world'
+PASS parent.childNodes[3] is an instance of Element
+PASS parent.childNodes[3] is d2
+PASS parent.childNodes[4] is an instance of Comment
+PASS parent.childNodes[4] is child
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomChildNodebeforehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/ChildNode-before.html (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ChildNode-before.html (rev 0)
+++ trunk/LayoutTests/fast/dom/ChildNode-before.html 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,133 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+
+description("Tests ChildNode.before((Node or DOMString)...)");
+function test(t, createChild)
+{
+ type = t;
+ debug("<b>Test " + type + ".before((Node or DOMString)...).</b>");
+
+ debug("Test with no arguments.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ child.before();
+ shouldBe("parent.childNodes.length", "1");
+ debug("");
+
+ debug("Test with a single element.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ child.before(d1);
+ shouldBe("parent.childNodes.length", "2");
+ shouldBe("child.previousSibling", "d1");
+ debug("");
+
+ debug("Test with a single string.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ child.before('hello');
+ shouldBe("parent.childNodes.length", "2");
+ shouldBe("child.previousSibling.data", "'hello'");
+ debug("");
+
+ debug("Test with a both strings and elements.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ child.before('hello', d1);
+ shouldBe("parent.childNodes.length", "3");
+ shouldBe("child.previousSibling", "d1");
+ shouldBeType("parent.childNodes[0]", "Text");
+ shouldBe("parent.childNodes[0].data", "'hello'");
+ shouldBeType("parent.childNodes[1]", "Element");
+ shouldBe("parent.childNodes[1]", "d1");
+ debug("");
+
+ debug("Test conversion to string");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ child.before(null, undefined, 7);
+ shouldBe("parent.childNodes.length", "4");
+ shouldBeType("parent.childNodes[0]", "Text");
+ shouldBe("parent.childNodes[0].data", "'null'");
+ shouldBeType("parent.childNodes[1]", "Text");
+ shouldBe("parent.childNodes[1].data", "'undefined'");
+ shouldBeType("parent.childNodes[2]", "Text");
+ shouldBe("parent.childNodes[2].data", "'7'");
+ shouldBeType("parent.childNodes[3]", type);
+ shouldBe("parent.childNodes[3]", "child");
+ debug("");
+
+ debug("Test a child without a parent.");
+ child = createChild();
+ d1 = document.createElement("div");
+ child.before(d1);
+ shouldBeNull("child.previousSibling");
+ debug("");
+
+ debug("Test when there the previous sibling is not a viable previous sibling.");
+ parent = document.createElement('div');
+ child = createChild();
+ d1 = document.createElement("div");
+ parent.appendChild(d1);
+ d2 = document.createElement("div");
+ parent.appendChild(d2);
+ parent.appendChild(child);
+ child.before("hello", d2, "world");
+ shouldBe("parent.childNodes.length", "5");
+ shouldBeType("parent.childNodes[0]", "Element");
+ shouldBe("parent.childNodes[0]", "d1");
+ shouldBeType("parent.childNodes[1]", "Text");
+ shouldBe("parent.childNodes[1].data", "'hello'");
+ shouldBeType("parent.childNodes[2]", "Element");
+ shouldBe("parent.childNodes[2]", "d2");
+ shouldBeType("parent.childNodes[3]", "Text");
+ shouldBe("parent.childNodes[3].data", "'world'");
+ shouldBeType("parent.childNodes[4]", type);
+ shouldBe("parent.childNodes[4]", "child");
+ debug("");
+
+ debug("Test when there is no viable previous sibling.");
+ parent = document.createElement('div');
+ child = createChild();
+ d1 = document.createElement("div");
+ parent.appendChild(d1);
+ d2 = document.createElement("div");
+ parent.appendChild(d2);
+ parent.appendChild(child);
+ child.before("hello", d1, "world", d2);
+ shouldBe("parent.childNodes.length", "5");
+ shouldBeType("parent.childNodes[0]", "Text");
+ shouldBe("parent.childNodes[0].data", "'hello'");
+ shouldBeType("parent.childNodes[1]", "Element");
+ shouldBe("parent.childNodes[1]", "d1");
+ shouldBeType("parent.childNodes[2]", "Text");
+ shouldBe("parent.childNodes[2].data", "'world'");
+ shouldBeType("parent.childNodes[3]", "Element");
+ shouldBe("parent.childNodes[3]", "d2");
+ shouldBeType("parent.childNodes[4]", type);
+ shouldBe("parent.childNodes[4]", "child");
+
+ debug("");
+}
+
+test("Element", function() { return document.createElement("div"); });
+test("Text", function() { return document.createTextNode("text node text"); });
+test("Comment", function() { return document.createComment("comment text"); });
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomChildNodereplaceWithexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/ChildNode-replaceWith-expected.txt (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ChildNode-replaceWith-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/ChildNode-replaceWith-expected.txt 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,183 @@
</span><ins>+Tests ChildNode.replaceWith((Node or DOMString)...)
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Test Element.replaceWith((Node or DOMString)...).
+Test with no arguments.
+PASS parent.childNodes.length is 1
+
+Test with a single element.
+PASS parent.childNodes.length is 1
+PASS parent.childNodes[0] is d1
+
+Test with a single string.
+PASS parent.childNodes.length is 1
+PASS parent.childNodes[0].data is 'hello'
+
+Test with a both strings and elements.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'hello'
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+
+Test conversion to string
+PASS parent.childNodes.length is 3
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'null'
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'undefined'
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is '7'
+
+Test a child without a parent.
+PASS child.replaceWith(d1) did not throw exception.
+
+Test replacing with an existing sibling.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is d1
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d2
+
+Test replacing a child with itself.
+PASS parent.childNodes.length is 1
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is child
+
+Test replacing a child with itself and another node.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+
+Test replacing a child with itself and a sibling.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is d1
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is child
+
+
+Test Text.replaceWith((Node or DOMString)...).
+Test with no arguments.
+PASS parent.childNodes.length is 1
+
+Test with a single element.
+PASS parent.childNodes.length is 1
+PASS parent.childNodes[0] is d1
+
+Test with a single string.
+PASS parent.childNodes.length is 1
+PASS parent.childNodes[0].data is 'hello'
+
+Test with a both strings and elements.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'hello'
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+
+Test conversion to string
+PASS parent.childNodes.length is 3
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'null'
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'undefined'
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is '7'
+
+Test a child without a parent.
+PASS child.replaceWith(d1) did not throw exception.
+
+Test replacing with an existing sibling.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is d1
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d2
+
+Test replacing a child with itself.
+PASS parent.childNodes.length is 1
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0] is child
+
+Test replacing a child with itself and another node.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+
+Test replacing a child with itself and a sibling.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is d1
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1] is child
+
+
+Test Comment.replaceWith((Node or DOMString)...).
+Test with no arguments.
+PASS parent.childNodes.length is 1
+
+Test with a single element.
+PASS parent.childNodes.length is 1
+PASS parent.childNodes[0] is d1
+
+Test with a single string.
+PASS parent.childNodes.length is 1
+PASS parent.childNodes[0].data is 'hello'
+
+Test with a both strings and elements.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'hello'
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+
+Test conversion to string
+PASS parent.childNodes.length is 3
+PASS parent.childNodes[0] is an instance of Text
+PASS parent.childNodes[0].data is 'null'
+PASS parent.childNodes[1] is an instance of Text
+PASS parent.childNodes[1].data is 'undefined'
+PASS parent.childNodes[2] is an instance of Text
+PASS parent.childNodes[2].data is '7'
+
+Test a child without a parent.
+PASS child.replaceWith(d1) did not throw exception.
+
+Test replacing with an existing sibling.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is d1
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d2
+
+Test replacing a child with itself.
+PASS parent.childNodes.length is 1
+PASS parent.childNodes[0] is an instance of Comment
+PASS parent.childNodes[0] is child
+
+Test replacing a child with itself and another node.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Comment
+PASS parent.childNodes[0] is child
+PASS parent.childNodes[1] is an instance of Element
+PASS parent.childNodes[1] is d1
+
+Test replacing a child with itself and a sibling.
+PASS parent.childNodes.length is 2
+PASS parent.childNodes[0] is an instance of Element
+PASS parent.childNodes[0] is d1
+PASS parent.childNodes[1] is an instance of Comment
+PASS parent.childNodes[1] is child
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomChildNodereplaceWithhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/ChildNode-replaceWith.html (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ChildNode-replaceWith.html (rev 0)
+++ trunk/LayoutTests/fast/dom/ChildNode-replaceWith.html 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,139 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+
+description("Tests ChildNode.replaceWith((Node or DOMString)...)");
+function test(t, createChild)
+{
+ type = t;
+ debug("<b>Test " + type + ".replaceWith((Node or DOMString)...).</b>");
+
+ debug("Test with no arguments.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ child.replaceWith();
+ shouldBe("parent.childNodes.length", "1");
+ debug("");
+
+ debug("Test with a single element.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ child.replaceWith(d1);
+ shouldBe("parent.childNodes.length", "1");
+ shouldBe("parent.childNodes[0]", "d1");
+ debug("");
+
+ debug("Test with a single string.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ child.replaceWith('hello');
+ shouldBe("parent.childNodes.length", "1");
+ shouldBe("parent.childNodes[0].data", "'hello'");
+ debug("");
+
+ debug("Test with a both strings and elements.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ child.replaceWith('hello', d1);
+ shouldBe("parent.childNodes.length", "2");
+ shouldBeType("parent.childNodes[0]", "Text");
+ shouldBe("parent.childNodes[0].data", "'hello'");
+ shouldBeType("parent.childNodes[1]", "Element");
+ shouldBe("parent.childNodes[1]", "d1");
+ debug("");
+
+ debug("Test conversion to string");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ child.replaceWith(null, undefined, 7);
+ shouldBe("parent.childNodes.length", "3");
+ shouldBeType("parent.childNodes[0]", "Text");
+ shouldBe("parent.childNodes[0].data", "'null'");
+ shouldBeType("parent.childNodes[1]", "Text");
+ shouldBe("parent.childNodes[1].data", "'undefined'");
+ shouldBeType("parent.childNodes[2]", "Text");
+ shouldBe("parent.childNodes[2].data", "'7'");
+ debug("");
+
+ debug("Test a child without a parent.");
+ child = createChild();
+ d1 = document.createElement("div");
+ shouldNotThrow("child.replaceWith(d1)");
+ debug("");
+
+ debug("Test replacing with an existing sibling.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ parent.appendChild(d1);
+ d2 = document.createElement("div");
+ parent.appendChild(d2);
+ child.replaceWith(d1);
+ shouldBe("parent.childNodes.length", "2");
+ shouldBeType("parent.childNodes[0]", "Element");
+ shouldBe("parent.childNodes[0]", "d1");
+ shouldBeType("parent.childNodes[1]", "Element");
+ shouldBe("parent.childNodes[1]", "d2");
+ debug("");
+
+ debug("Test replacing a child with itself.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ child.replaceWith(child);
+ shouldBe("parent.childNodes.length", "1");
+ shouldBeType("parent.childNodes[0]", type);
+ shouldBe("parent.childNodes[0]", "child");
+ debug("");
+
+ debug("Test replacing a child with itself and another node.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ child.replaceWith(child, d1);
+ shouldBe("parent.childNodes.length", "2");
+ shouldBeType("parent.childNodes[0]", type);
+ shouldBe("parent.childNodes[0]", "child");
+ shouldBeType("parent.childNodes[1]", "Element");
+ shouldBe("parent.childNodes[1]", "d1");
+ debug("");
+
+ debug("Test replacing a child with itself and a sibling.");
+ parent = document.createElement('div');
+ child = createChild();
+ parent.appendChild(child);
+ d1 = document.createElement("div");
+ parent.appendChild(d1);
+ child.replaceWith(d1, child);
+ shouldBe("parent.childNodes.length", "2");
+ shouldBeType("parent.childNodes[0]", "Element");
+ shouldBe("parent.childNodes[0]", "d1");
+ shouldBeType("parent.childNodes[1]", type);
+ shouldBe("parent.childNodes[1]", "child");
+ debug("");
+
+ debug("");
+}
+
+test("Element", function() { return document.createElement("div"); });
+test("Text", function() { return document.createTextNode("text node text"); });
+test("Comment", function() { return document.createComment("comment text"); });
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomParentNodeappendexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/ParentNode-append-expected.txt (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ParentNode-append-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/ParentNode-append-expected.txt 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+Tests ParentNode.append((Node or DOMString)...)
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Test Element.append((Node or DOMString)...).
+
+Test single node.
+PASS d1.parentNode is container
+
+Test multiple nodes.
+PASS d1.parentNode is container
+PASS d2.parentNode is container
+PASS d1.nextSibling is d2
+PASS d2.previousSibling is d1
+
+Test a single string.
+PASS container.firstChild is an instance of Text
+PASS container.firstChild.data is 'hello'
+
+Test multiple strings.
+PASS container.childNodes[0] is an instance of Text
+PASS container.childNodes[0].data is 'hello'
+PASS container.childNodes[1] is an instance of Text
+PASS container.childNodes[1].data is 'world'
+
+Test nodes and strings.
+PASS container.childNodes[0] is an instance of Text
+PASS container.childNodes[1] is an instance of Element
+PASS container.childNodes[2] is an instance of Text
+
+Test when container already has children.
+PASS container.childNodes[0] is an instance of Element
+PASS container.childNodes[0] is d1
+PASS container.childNodes[1] is an instance of Element
+PASS container.childNodes[1] is d2
+PASS container.childNodes[2] is an instance of Text
+PASS container.childNodes[2].data is 'hello'
+
+Test conversion to string
+PASS container.childNodes[0] is an instance of Text
+PASS container.childNodes[0].data is 'null'
+PASS container.childNodes[1] is an instance of Text
+PASS container.childNodes[1].data is 'undefined'
+PASS container.childNodes[2] is an instance of Text
+PASS container.childNodes[2].data is '7'
+
+Test no parameters
+PASS container.append() did not throw exception.
+PASS container.childNodes.length is 0
+
+Test error condition of self-appending.
+PASS container.append(container) threw exception Error: HierarchyRequestError: DOM Exception 3.
+
+Test DocumentFragment.append((Node or DOMString)...).
+PASS d1.parentNode is fragment
+
+Test Document.append((Node or DOMString)...).
+
+Test simple case of single child append.
+PASS d1.parentNode is doc
+
+Test case appending a root element and a comment.
+PASS d1.parentNode is doc
+PASS c1.parentNode is doc
+
+Test error condition appending a second root element.
+PASS doc.append(d2) threw exception Error: HierarchyRequestError: DOM Exception 3.
+
+Test error condition appending Text node as the root element.
+PASS doc.append('hello') threw exception Error: HierarchyRequestError: DOM Exception 3.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomParentNodeappendhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/ParentNode-append.html (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ParentNode-append.html (rev 0)
+++ trunk/LayoutTests/fast/dom/ParentNode-append.html 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,142 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+
+description("Tests ParentNode.append((Node or DOMString)...)");
+
+debug("Test Element.append((Node or DOMString)...).");
+debug("");
+debug("Test single node.");
+var container = document.createElement("div");
+var d1 = document.createElement("div");
+container.append(d1);
+shouldBe("d1.parentNode", "container");
+debug("");
+
+debug("Test multiple nodes.");
+container = document.createElement("div");
+d1 = document.createElement("div");
+var d2 = document.createElement("div");
+container.append(d1, d2);
+shouldBe("d1.parentNode", "container");
+shouldBe("d2.parentNode", "container");
+shouldBe("d1.nextSibling", "d2");
+shouldBe("d2.previousSibling", "d1");
+debug("");
+
+debug("Test a single string.");
+container = document.createElement("div");
+container.append("hello");
+shouldBeType("container.firstChild", "Text");
+shouldBe("container.firstChild.data", "'hello'");
+debug("");
+
+debug("Test multiple strings.");
+container = document.createElement("div");
+container.append("hello", "world");
+shouldBeType("container.childNodes[0]", "Text");
+shouldBe("container.childNodes[0].data", "'hello'");
+shouldBeType("container.childNodes[1]", "Text");
+shouldBe("container.childNodes[1].data", "'world'");
+debug("");
+
+debug("Test nodes and strings.");
+container = document.createElement("div");
+d1 = document.createElement("div");
+container.append("hello", d1, "world");
+shouldBeType("container.childNodes[0]", "Text");
+shouldBeType("container.childNodes[1]", "Element");
+shouldBeType("container.childNodes[2]", "Text");
+debug("");
+
+debug("Test when container already has children.");
+container = document.createElement("div");
+d1 = document.createElement("div");
+d2 = document.createElement("div");
+container.appendChild(d1);
+container.append(d2, "hello");
+shouldBeType("container.childNodes[0]", "Element");
+shouldBe("container.childNodes[0]", "d1");
+shouldBeType("container.childNodes[1]", "Element");
+shouldBe("container.childNodes[1]", "d2");
+shouldBeType("container.childNodes[2]", "Text");
+shouldBe("container.childNodes[2].data", "'hello'");
+debug("");
+
+debug("Test conversion to string");
+container = document.createElement("div");
+container.append(null, undefined, 7);
+shouldBeType("container.childNodes[0]", "Text");
+shouldBe("container.childNodes[0].data", "'null'");
+shouldBeType("container.childNodes[1]", "Text");
+shouldBe("container.childNodes[1].data", "'undefined'");
+shouldBeType("container.childNodes[2]", "Text");
+shouldBe("container.childNodes[2].data", "'7'");
+debug("");
+
+debug("Test no parameters");
+container = document.createElement("div");
+shouldNotThrow("container.append()");
+shouldBe("container.childNodes.length", "0");
+debug("");
+
+debug("Test error condition of self-appending.");
+container = document.createElement("div");
+shouldThrow("container.append(container)");
+debug("");
+
+debug("Test DocumentFragment.append((Node or DOMString)...).");
+var fragment = document.createDocumentFragment();
+d1 = document.createElement("div");
+fragment.append(d1);
+shouldBe("d1.parentNode", "fragment");
+debug("");
+
+
+debug("Test Document.append((Node or DOMString)...).");
+debug("")
+debug("Test simple case of single child append.")
+var doc = document.implementation.createHTMLDocument();
+while (doc.firstChild)
+ doc.firstChild.remove();
+d1 = doc.createElement("div");
+doc.append(d1);
+shouldBe("d1.parentNode", "doc");
+debug("");
+
+debug("Test case appending a root element and a comment.")
+var doc = document.implementation.createHTMLDocument();
+while (doc.firstChild)
+ doc.firstChild.remove();
+d1 = doc.createElement("div");
+c1 = doc.createComment("comment text");
+doc.append(d1, c1);
+shouldBe("d1.parentNode", "doc");
+shouldBe("c1.parentNode", "doc");
+debug("");
+
+debug("Test error condition appending a second root element.")
+doc = document.implementation.createHTMLDocument();
+while (doc.firstChild)
+ doc.firstChild.remove();
+d1 = doc.createElement("div");
+d2 = doc.createElement("div");
+doc.appendChild(d1);
+shouldThrow("doc.append(d2)");
+debug("");
+
+debug("Test error condition appending Text node as the root element.")
+doc = document.implementation.createHTMLDocument();
+while (doc.firstChild)
+ doc.firstChild.remove();
+shouldThrow("doc.append('hello')");
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomParentNodeprependexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/ParentNode-prepend-expected.txt (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ParentNode-prepend-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/ParentNode-prepend-expected.txt 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+Tests ParentNode.prepend((Node or DOMString)...)
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Test Element.prepend((Node or DOMString)...).
+
+Test single node.
+PASS d1.parentNode is container
+
+Test multiple nodes.
+PASS d1.parentNode is container
+PASS d2.parentNode is container
+PASS d1.nextSibling is d2
+PASS d2.previousSibling is d1
+
+Test a single string.
+PASS container.firstChild is an instance of Text
+PASS container.firstChild.data is 'hello'
+
+Test multiple strings.
+PASS container.childNodes[0] is an instance of Text
+PASS container.childNodes[0].data is 'hello'
+PASS container.childNodes[1] is an instance of Text
+PASS container.childNodes[1].data is 'world'
+
+Test nodes and strings.
+PASS container.childNodes[0] is an instance of Text
+PASS container.childNodes[1] is an instance of Element
+PASS container.childNodes[2] is an instance of Text
+
+Test when container already has children.
+PASS container.childNodes[0] is an instance of Element
+PASS container.childNodes[0] is d2
+PASS container.childNodes[1] is an instance of Text
+PASS container.childNodes[1].data is 'hello'
+PASS container.childNodes[2] is an instance of Element
+PASS container.childNodes[2] is d1
+
+Test conversion to string
+PASS container.childNodes[0] is an instance of Text
+PASS container.childNodes[0].data is 'null'
+PASS container.childNodes[1] is an instance of Text
+PASS container.childNodes[1].data is 'undefined'
+PASS container.childNodes[2] is an instance of Text
+PASS container.childNodes[2].data is '7'
+
+Test no parameters
+PASS container.prepend() did not throw exception.
+PASS container.childNodes.length is 0
+
+Test error condition of self-prepending.
+PASS container.prepend(container) threw exception Error: HierarchyRequestError: DOM Exception 3.
+
+Test DocumentFragment.prepend((Node or DOMString)...).
+PASS d1.parentNode is fragment
+
+Test Document.prepend((Node or DOMString)...).
+
+Test simple case of single child prepend.
+PASS d1.parentNode is doc
+
+Test case prepending a root element and a comment.
+PASS d1.parentNode is doc
+PASS c1.parentNode is doc
+
+Test error condition prepending a second root element.
+PASS doc.prepend(d2) threw exception Error: HierarchyRequestError: DOM Exception 3.
+
+Test error condition prepending Text node as the root element.
+PASS doc.prepend('hello') threw exception Error: HierarchyRequestError: DOM Exception 3.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomParentNodeprependhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/ParentNode-prepend.html (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ParentNode-prepend.html (rev 0)
+++ trunk/LayoutTests/fast/dom/ParentNode-prepend.html 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,142 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+
+description("Tests ParentNode.prepend((Node or DOMString)...)");
+
+debug("Test Element.prepend((Node or DOMString)...).");
+debug("");
+debug("Test single node.");
+var container = document.createElement("div");
+var d1 = document.createElement("div");
+container.prepend(d1);
+shouldBe("d1.parentNode", "container");
+debug("");
+
+debug("Test multiple nodes.");
+container = document.createElement("div");
+d1 = document.createElement("div");
+var d2 = document.createElement("div");
+container.prepend(d1, d2);
+shouldBe("d1.parentNode", "container");
+shouldBe("d2.parentNode", "container");
+shouldBe("d1.nextSibling", "d2");
+shouldBe("d2.previousSibling", "d1");
+debug("");
+
+debug("Test a single string.");
+container = document.createElement("div");
+container.prepend("hello");
+shouldBeType("container.firstChild", "Text");
+shouldBe("container.firstChild.data", "'hello'");
+debug("");
+
+debug("Test multiple strings.");
+container = document.createElement("div");
+container.prepend("hello", "world");
+shouldBeType("container.childNodes[0]", "Text");
+shouldBe("container.childNodes[0].data", "'hello'");
+shouldBeType("container.childNodes[1]", "Text");
+shouldBe("container.childNodes[1].data", "'world'");
+debug("");
+
+debug("Test nodes and strings.");
+container = document.createElement("div");
+d1 = document.createElement("div");
+container.prepend("hello", d1, "world");
+shouldBeType("container.childNodes[0]", "Text");
+shouldBeType("container.childNodes[1]", "Element");
+shouldBeType("container.childNodes[2]", "Text");
+debug("");
+
+debug("Test when container already has children.");
+container = document.createElement("div");
+d1 = document.createElement("div");
+d2 = document.createElement("div");
+container.appendChild(d1);
+container.prepend(d2, "hello");
+shouldBeType("container.childNodes[0]", "Element");
+shouldBe("container.childNodes[0]", "d2");
+shouldBeType("container.childNodes[1]", "Text");
+shouldBe("container.childNodes[1].data", "'hello'");
+shouldBeType("container.childNodes[2]", "Element");
+shouldBe("container.childNodes[2]", "d1");
+debug("");
+
+debug("Test conversion to string");
+container = document.createElement("div");
+container.prepend(null, undefined, 7);
+shouldBeType("container.childNodes[0]", "Text");
+shouldBe("container.childNodes[0].data", "'null'");
+shouldBeType("container.childNodes[1]", "Text");
+shouldBe("container.childNodes[1].data", "'undefined'");
+shouldBeType("container.childNodes[2]", "Text");
+shouldBe("container.childNodes[2].data", "'7'");
+debug("");
+
+debug("Test no parameters");
+container = document.createElement("div");
+shouldNotThrow("container.prepend()");
+shouldBe("container.childNodes.length", "0");
+debug("");
+
+debug("Test error condition of self-prepending.");
+container = document.createElement("div");
+shouldThrow("container.prepend(container)");
+debug("");
+
+debug("Test DocumentFragment.prepend((Node or DOMString)...).");
+var fragment = document.createDocumentFragment();
+d1 = document.createElement("div");
+fragment.prepend(d1);
+shouldBe("d1.parentNode", "fragment");
+debug("");
+
+
+debug("Test Document.prepend((Node or DOMString)...).");
+debug("")
+debug("Test simple case of single child prepend.")
+var doc = document.implementation.createHTMLDocument();
+while (doc.firstChild)
+ doc.firstChild.remove();
+d1 = doc.createElement("div");
+doc.prepend(d1);
+shouldBe("d1.parentNode", "doc");
+debug("");
+
+debug("Test case prepending a root element and a comment.")
+var doc = document.implementation.createHTMLDocument();
+while (doc.firstChild)
+ doc.firstChild.remove();
+d1 = doc.createElement("div");
+c1 = doc.createComment("comment text");
+doc.prepend(d1, c1);
+shouldBe("d1.parentNode", "doc");
+shouldBe("c1.parentNode", "doc");
+debug("");
+
+debug("Test error condition prepending a second root element.")
+doc = document.implementation.createHTMLDocument();
+while (doc.firstChild)
+ doc.firstChild.remove();
+d1 = doc.createElement("div");
+d2 = doc.createElement("div");
+doc.appendChild(d1);
+shouldThrow("doc.prepend(d2)");
+debug("");
+
+debug("Test error condition prepending Text node as the root element.")
+doc = document.implementation.createHTMLDocument();
+while (doc.firstChild)
+ doc.firstChild.remove();
+shouldThrow("doc.prepend('hello')");
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -1088,6 +1088,7 @@
</span><span class="cx"> bindings/js/JSCallbackData.cpp
</span><span class="cx"> bindings/js/JSCanvasRenderingContext2DCustom.cpp
</span><span class="cx"> bindings/js/JSCanvasRenderingContextCustom.cpp
</span><ins>+ bindings/js/JSCharacterDataCustom.cpp
</ins><span class="cx"> bindings/js/JSCommandLineAPIHostCustom.cpp
</span><span class="cx"> bindings/js/JSCryptoAlgorithmBuilder.cpp
</span><span class="cx"> bindings/js/JSCryptoAlgorithmDictionary.cpp
</span><span class="lines">@@ -1119,6 +1120,8 @@
</span><span class="cx"> bindings/js/JSDeviceOrientationEventCustom.cpp
</span><span class="cx"> bindings/js/JSDictionary.cpp
</span><span class="cx"> bindings/js/JSDocumentCustom.cpp
</span><ins>+ bindings/js/JSDocumentFragmentCustom.cpp
+ bindings/js/JSDocumentTypeCustom.cpp
</ins><span class="cx"> bindings/js/JSElementCustom.cpp
</span><span class="cx"> bindings/js/JSErrorHandler.cpp
</span><span class="cx"> bindings/js/JSEventCustom.cpp
</span><span class="lines">@@ -1168,6 +1171,7 @@
</span><span class="cx"> bindings/js/JSNodeFilterCondition.cpp
</span><span class="cx"> bindings/js/JSNodeFilterCustom.cpp
</span><span class="cx"> bindings/js/JSNodeIteratorCustom.cpp
</span><ins>+ bindings/js/JSNodeOrString.cpp
</ins><span class="cx"> bindings/js/JSNodeListCustom.cpp
</span><span class="cx"> bindings/js/JSOscillatorNodeCustom.cpp
</span><span class="cx"> bindings/js/JSPannerNodeCustom.cpp
</span><span class="lines">@@ -1444,6 +1448,7 @@
</span><span class="cx"> dom/NodeFilter.cpp
</span><span class="cx"> dom/NodeFilterCondition.cpp
</span><span class="cx"> dom/NodeIterator.cpp
</span><ins>+ dom/NodeOrString.cpp
</ins><span class="cx"> dom/NodeRareData.cpp
</span><span class="cx"> dom/NodeRenderingTraversal.cpp
</span><span class="cx"> dom/NodeTraversal.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/ChangeLog 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -1,3 +1,93 @@
</span><ins>+2015-07-05 Sam Weinig <sam@webkit.org>
+
+ DOM4: prepend, append, before, after & replace
+ https://bugs.webkit.org/show_bug.cgi?id=74648
+
+ Reviewed by Darin Adler.
+
+ - Adds support for ChildNode.before/after/replaceWith and ParentNode.prepend/append
+ which are new functions in https://dom.spec.whatwg.org
+ - Uses custom bindings rather than implementing support for union types in the code
+ generator as their uses seems isolated to just this spec at the moment. If more
+ uses come along, we should implement proper support for them in the generator and
+ remove the custom bindings added here.
+
+ Tests: fast/dom/ChildNode-after.html
+ fast/dom/ChildNode-before.html
+ fast/dom/ChildNode-replaceWith.html
+ fast/dom/ParentNode-append.html
+ fast/dom/ParentNode-prepend.html
+
+ * CMakeLists.txt:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSBindingsAllInOne.cpp:
+ Add new files.
+
+ * bindings/js/JSCharacterDataCustom.cpp: Added.
+ (WebCore::JSCharacterData::before):
+ (WebCore::JSCharacterData::after):
+ (WebCore::JSCharacterData::replaceWith):
+ * bindings/js/JSDocumentCustom.cpp:
+ (WebCore::JSDocument::prepend):
+ (WebCore::JSDocument::append):
+ (WebCore::JSDocument::createTouchList):
+ * bindings/js/JSDocumentFragmentCustom.cpp: Added.
+ (WebCore::JSDocumentFragment::prepend):
+ (WebCore::JSDocumentFragment::append):
+ * bindings/js/JSDocumentTypeCustom.cpp: Added.
+ (WebCore::JSDocumentType::before):
+ (WebCore::JSDocumentType::after):
+ (WebCore::JSDocumentType::replaceWith):
+ * bindings/js/JSElementCustom.cpp:
+ (WebCore::toJSNewlyCreated):
+ (WebCore::JSElement::before):
+ (WebCore::JSElement::after):
+ (WebCore::JSElement::replaceWith):
+ (WebCore::JSElement::prepend):
+ (WebCore::JSElement::append):
+ Add custom bindings to implement the use of variadic union types.
+
+ * bindings/js/JSNodeOrString.cpp: Added.
+ (WebCore::toNodeOrStringVector):
+ * bindings/js/JSNodeOrString.h: Added.
+ Adds a help function for converting an JS argument list into a Vector
+ of NodeOrString objects.
+
+ * dom/ChildNode.idl:
+ Expose before/after/replaceWith to JavaScript.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::append):
+ (WebCore::ContainerNode::prepend):
+ * dom/ContainerNode.h:
+ Add implementations of append and prepend.
+
+ * dom/Node.h:
+ * dom/Node.cpp:
+ (WebCore::nodeSetPreTransformedFromNodeOrStringVector):
+ (WebCore::firstPrecedingSiblingNotInNodeSet):
+ (WebCore::firstFollowingSiblingNotInNodeSet):
+ Helper functions for before, after and removeWith.
+
+ (WebCore::Node::before):
+ (WebCore::Node::after):
+ (WebCore::Node::replaceWith):
+ Add implementations of before, after and removeWith.
+
+ * dom/NodeOrString.cpp: Added.
+ (WebCore::convertNodesOrStringsIntoNode):
+ * dom/NodeOrString.h: Added.
+ (WebCore::NodeOrString::NodeOrString):
+ (WebCore::NodeOrString::~NodeOrString):
+ (WebCore::NodeOrString::type):
+ (WebCore::NodeOrString::node):
+ (WebCore::NodeOrString::string):
+ Custom union type representing the (Node or DOMString) IDL type.
+
+ * dom/ParentNode.idl:
+ Expose append/prepend to JavaScript.
+
</ins><span class="cx"> 2015-07-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -13835,6 +13835,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\dom\NodeOrString.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\dom\NodeRareData.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -16679,6 +16693,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\bindings\js\JSCharacterDataCustom.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\bindings\js\JSCDATASectionCustom.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -16875,6 +16903,34 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\bindings\js\JSDocumentFragmentCustom.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\bindings\js\JSDocumentTypeCustom.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\bindings\js\JSDOMBinding.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17590,6 +17646,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\bindings\js\JSNodeOrString.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\bindings\js\JSNodeFilterCondition.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -21205,6 +21275,7 @@
</span><span class="cx"> <ClInclude Include="..\dom\NodeFilter.h" />
</span><span class="cx"> <ClInclude Include="..\dom\NodeFilterCondition.h" />
</span><span class="cx"> <ClInclude Include="..\dom\NodeIterator.h" />
</span><ins>+ <ClInclude Include="..\dom\NodeOrString.h" />
</ins><span class="cx"> <ClInclude Include="..\dom\NodeTraversal.h" />
</span><span class="cx"> <ClInclude Include="..\dom\OverflowEvent.h" />
</span><span class="cx"> <ClInclude Include="..\dom\PageTransitionEvent.h" />
</span><span class="lines">@@ -21600,6 +21671,7 @@
</span><span class="cx"> <ClInclude Include="..\bindings\js\JSMessagePortCustom.h" />
</span><span class="cx"> <ClInclude Include="..\bindings\js\JSMutationCallback.h" />
</span><span class="cx"> <ClInclude Include="..\bindings\js\JSNodeCustom.h" />
</span><ins>+ <ClInclude Include="..\bindings\js\JSNodeOrString.h" />
</ins><span class="cx"> <ClInclude Include="..\bindings\js\JSNodeFilterCondition.h" />
</span><span class="cx"> <ClInclude Include="..\bindings\js\JSPluginElementFunctions.h" />
</span><span class="cx"> <ClInclude Include="..\bindings\js\JSWorkerGlobalScopeBase.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -2533,6 +2533,9 @@
</span><span class="cx"> 7C1E97281A9F9834007BF0FB /* AutoFillButtonElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C1E97261A9F9834007BF0FB /* AutoFillButtonElement.h */; };
</span><span class="cx"> 7C2BDD3D17C7F98C0038FF15 /* JSDOMGlobalObjectTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C2BDD3B17C7F98B0038FF15 /* JSDOMGlobalObjectTask.cpp */; };
</span><span class="cx"> 7C2BDD3E17C7F98C0038FF15 /* JSDOMGlobalObjectTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2BDD3C17C7F98B0038FF15 /* JSDOMGlobalObjectTask.h */; };
</span><ins>+ 7C33F35A1B4A044800502CAF /* JSCharacterDataCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C33F3581B4A044800502CAF /* JSCharacterDataCustom.cpp */; };
+ 7C33F35E1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C33F35C1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp */; };
+ 7C33F3621B4A050400502CAF /* JSDocumentFragmentCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C33F3601B4A050400502CAF /* JSDocumentFragmentCustom.cpp */; };
</ins><span class="cx"> 7C3B79711908757B00B47A2D /* UserMessageHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C3B796F1908757B00B47A2D /* UserMessageHandler.cpp */; };
</span><span class="cx"> 7C3B79721908757B00B47A2D /* UserMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C3B79701908757B00B47A2D /* UserMessageHandler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7C3E510A18DF8F3500C112F7 /* HTMLConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C3E510818DF8F3500C112F7 /* HTMLConverter.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2564,6 +2567,8 @@
</span><span class="cx"> 7C74D43818823B1900E5ED57 /* UTextProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C74D43618823B1900E5ED57 /* UTextProvider.h */; };
</span><span class="cx"> 7C74D43B1882400400E5ED57 /* UTextProviderUTF16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C74D4391882400400E5ED57 /* UTextProviderUTF16.cpp */; };
</span><span class="cx"> 7C74D43C1882400400E5ED57 /* UTextProviderUTF16.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C74D43A1882400400E5ED57 /* UTextProviderUTF16.h */; };
</span><ins>+ 7C91A38F1B498ABE003F9EFA /* JSNodeOrString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C91A38D1B498ABE003F9EFA /* JSNodeOrString.cpp */; };
+ 7C91A3901B498ABE003F9EFA /* JSNodeOrString.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C91A38E1B498ABE003F9EFA /* JSNodeOrString.h */; };
</ins><span class="cx"> 7C93F3491AA6BA5E00A98BAB /* CompiledContentExtension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C93F3471AA6BA5E00A98BAB /* CompiledContentExtension.cpp */; };
</span><span class="cx"> 7C93F34A1AA6BA5E00A98BAB /* CompiledContentExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C93F3481AA6BA5E00A98BAB /* CompiledContentExtension.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7C93F34D1AA6BF0700A98BAB /* ContentExtensionCompiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C93F34B1AA6BF0700A98BAB /* ContentExtensionCompiler.cpp */; };
</span><span class="lines">@@ -2584,6 +2589,8 @@
</span><span class="cx"> 7CE683471921821500F4D928 /* UserMessageHandlerDescriptorTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CE683461921821500F4D928 /* UserMessageHandlerDescriptorTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7CE6CBFB187F370700D46BF5 /* FormatConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CE6CBFA187F370700D46BF5 /* FormatConverter.h */; };
</span><span class="cx"> 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CE6CBFC187F394900D46BF5 /* FormatConverter.cpp */; };
</span><ins>+ 7CEAC1071B483D1D00334482 /* NodeOrString.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CEAC1061B483D1D00334482 /* NodeOrString.h */; };
+ 7CEAC1091B483D7F00334482 /* NodeOrString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAC1081B483D7F00334482 /* NodeOrString.cpp */; };
</ins><span class="cx"> 7CFDC57C1AC1D80500E24A57 /* ContentExtensionError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CFDC57A1AC1D80500E24A57 /* ContentExtensionError.cpp */; };
</span><span class="cx"> 7CFDC57D1AC1D80500E24A57 /* ContentExtensionError.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CFDC57B1AC1D80500E24A57 /* ContentExtensionError.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7D741BDA177226AA00859170 /* CSSValueKeywords.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 6565814809D13043000E61D7 /* CSSValueKeywords.h */; };
</span><span class="lines">@@ -9843,6 +9850,9 @@
</span><span class="cx"> 7C1E97261A9F9834007BF0FB /* AutoFillButtonElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoFillButtonElement.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C2BDD3B17C7F98B0038FF15 /* JSDOMGlobalObjectTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMGlobalObjectTask.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C2BDD3C17C7F98B0038FF15 /* JSDOMGlobalObjectTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMGlobalObjectTask.h; sourceTree = "<group>"; };
</span><ins>+ 7C33F3581B4A044800502CAF /* JSCharacterDataCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCharacterDataCustom.cpp; sourceTree = "<group>"; };
+ 7C33F35C1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDocumentTypeCustom.cpp; sourceTree = "<group>"; };
+ 7C33F3601B4A050400502CAF /* JSDocumentFragmentCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDocumentFragmentCustom.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 7C3B796F1908757B00B47A2D /* UserMessageHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserMessageHandler.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C3B79701908757B00B47A2D /* UserMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMessageHandler.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C3E510818DF8F3500C112F7 /* HTMLConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLConverter.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -9885,6 +9895,8 @@
</span><span class="cx"> 7C74D43618823B1900E5ED57 /* UTextProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UTextProvider.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C74D4391882400400E5ED57 /* UTextProviderUTF16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UTextProviderUTF16.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C74D43A1882400400E5ED57 /* UTextProviderUTF16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UTextProviderUTF16.h; sourceTree = "<group>"; };
</span><ins>+ 7C91A38D1B498ABE003F9EFA /* JSNodeOrString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeOrString.cpp; sourceTree = "<group>"; };
+ 7C91A38E1B498ABE003F9EFA /* JSNodeOrString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNodeOrString.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7C93F3471AA6BA5E00A98BAB /* CompiledContentExtension.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompiledContentExtension.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C93F3481AA6BA5E00A98BAB /* CompiledContentExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompiledContentExtension.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C93F34B1AA6BF0700A98BAB /* ContentExtensionCompiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentExtensionCompiler.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -9905,6 +9917,8 @@
</span><span class="cx"> 7CE683461921821500F4D928 /* UserMessageHandlerDescriptorTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMessageHandlerDescriptorTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CE6CBFA187F370700D46BF5 /* FormatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormatConverter.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CE6CBFC187F394900D46BF5 /* FormatConverter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormatConverter.cpp; sourceTree = "<group>"; };
</span><ins>+ 7CEAC1061B483D1D00334482 /* NodeOrString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeOrString.h; sourceTree = "<group>"; };
+ 7CEAC1081B483D7F00334482 /* NodeOrString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NodeOrString.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 7CFDC57A1AC1D80500E24A57 /* ContentExtensionError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentExtensionError.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7CFDC57B1AC1D80500E24A57 /* ContentExtensionError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentExtensionError.h; sourceTree = "<group>"; };
</span><span class="cx"> 7E37EF2D1339208800B29250 /* SubresourceLoaderCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SubresourceLoaderCF.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -21282,6 +21296,8 @@
</span><span class="cx"> BCBFB53A0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp */,
</span><span class="cx"> BCBFB53B0DCD29CF0019B3E5 /* JSDOMWindowShell.h */,
</span><span class="cx"> 65E0E9431133C89F00B4CB10 /* JSDOMWrapper.h */,
</span><ins>+ 7C91A38D1B498ABE003F9EFA /* JSNodeOrString.cpp */,
+ 7C91A38E1B498ABE003F9EFA /* JSNodeOrString.h */,
</ins><span class="cx"> F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */,
</span><span class="cx"> F3D461471161D53200CA0D09 /* JSErrorHandler.h */,
</span><span class="cx"> BC60901E0E91B8EC000C68B5 /* JSEventTargetCustom.cpp */,
</span><span class="lines">@@ -21388,6 +21404,9 @@
</span><span class="cx"> 49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */,
</span><span class="cx"> 49EED14D1051971A00099FAB /* JSCanvasRenderingContextCustom.cpp */,
</span><span class="cx"> 93BA59B10F2AA5FE008E8E99 /* JSCDATASectionCustom.cpp */,
</span><ins>+ 7C33F3581B4A044800502CAF /* JSCharacterDataCustom.cpp */,
+ 7C33F35C1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp */,
+ 7C33F3601B4A050400502CAF /* JSDocumentFragmentCustom.cpp */,
</ins><span class="cx"> A584FE371864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp */,
</span><span class="cx"> 209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */,
</span><span class="cx"> E157A8E618184C67009F821D /* JSCryptoKeyCustom.cpp */,
</span><span class="lines">@@ -23278,6 +23297,8 @@
</span><span class="cx"> 1A750D870A90E394000FF215 /* NodeIterator.idl */,
</span><span class="cx"> A81872100977D3C0005826D9 /* NodeList.h */,
</span><span class="cx"> 85ACA9FA0A9B631000671E90 /* NodeList.idl */,
</span><ins>+ 7CEAC1081B483D7F00334482 /* NodeOrString.cpp */,
+ 7CEAC1061B483D1D00334482 /* NodeOrString.h */,
</ins><span class="cx"> 4FAB48661643A67E00F70C07 /* NodeRareData.cpp */,
</span><span class="cx"> 63189AE20E83A33300012E41 /* NodeRareData.h */,
</span><span class="cx"> A7211F231678A54200957444 /* NodeRenderingTraversal.cpp */,
</span><span class="lines">@@ -24787,6 +24808,7 @@
</span><span class="cx"> A74BB76B13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h in Headers */,
</span><span class="cx"> 148AFDA50AF58360008CC700 /* ExceptionHandlers.h in Headers */,
</span><span class="cx"> 9767CE0B145ABC13005E64DB /* ExceptionHeaders.h in Headers */,
</span><ins>+ 7C91A3901B498ABE003F9EFA /* JSNodeOrString.h in Headers */,
</ins><span class="cx"> 46F3E3FA1B2109100087ED13 /* VNodeTracker.h in Headers */,
</span><span class="cx"> 9767CE0C145ABC13005E64DB /* ExceptionInterfaces.h in Headers */,
</span><span class="cx"> 6E67D2A91280E8BD008758F7 /* Extensions3D.h in Headers */,
</span><span class="lines">@@ -24957,6 +24979,7 @@
</span><span class="cx"> FD31609D12B026F700C1A359 /* HRTFElevation.h in Headers */,
</span><span class="cx"> FD31609F12B026F700C1A359 /* HRTFKernel.h in Headers */,
</span><span class="cx"> FD3160A112B026F700C1A359 /* HRTFPanner.h in Headers */,
</span><ins>+ 7CEAC1071B483D1D00334482 /* NodeOrString.h in Headers */,
</ins><span class="cx"> BC97E23A109144950010D361 /* HTMLAllCollection.h in Headers */,
</span><span class="cx"> A8CFF7AB0A156978000A4234 /* HTMLAnchorElement.h in Headers */,
</span><span class="cx"> A871D45D0A127CBC00B12A68 /* HTMLAppletElement.h in Headers */,
</span><span class="lines">@@ -27749,6 +27772,7 @@
</span><span class="cx"> 070363E7181A1CDC00C074A5 /* AVVideoCaptureSource.mm in Sources */,
</span><span class="cx"> F45C231D1995B73B00A6E2E3 /* AxisScrollSnapOffsets.cpp in Sources */,
</span><span class="cx"> 37F57ACF1A5072DD00876F98 /* AXObjectCache.cpp in Sources */,
</span><ins>+ 7C33F35E1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp in Sources */,
</ins><span class="cx"> AAA728F916D1D8BC00D3BBC6 /* AXObjectCacheIOS.mm in Sources */,
</span><span class="cx"> 29A8124B0FBB9CA900510293 /* AXObjectCacheMac.mm in Sources */,
</span><span class="cx"> BCA8C81F11E3D36900812FB7 /* BackForwardController.cpp in Sources */,
</span><span class="lines">@@ -27851,6 +27875,7 @@
</span><span class="cx"> BCC0657D0F3CE1B700CD2D87 /* ClientRect.cpp in Sources */,
</span><span class="cx"> BCC065800F3CE1B700CD2D87 /* ClientRectList.cpp in Sources */,
</span><span class="cx"> 85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */,
</span><ins>+ 7CEAC1091B483D7F00334482 /* NodeOrString.cpp in Sources */,
</ins><span class="cx"> 580371611A66F00A00BAF519 /* ClipRect.cpp in Sources */,
</span><span class="cx"> CDEA76351460B71A008B31F1 /* Clock.cpp in Sources */,
</span><span class="cx"> CDEA76341460B56F008B31F1 /* ClockGeneric.cpp in Sources */,
</span><span class="lines">@@ -28198,6 +28223,7 @@
</span><span class="cx"> 85DF2F9C0AA3CAE500AD64C5 /* DOMHTMLOptionsCollection.mm in Sources */,
</span><span class="cx"> 85183B470AA6926100F19FA3 /* DOMHTMLParagraphElement.mm in Sources */,
</span><span class="cx"> 85ECBEF80AA7626900544F0B /* DOMHTMLParamElement.mm in Sources */,
</span><ins>+ 7C33F3621B4A050400502CAF /* JSDocumentFragmentCustom.cpp in Sources */,
</ins><span class="cx"> 85183B490AA6926100F19FA3 /* DOMHTMLPreElement.mm in Sources */,
</span><span class="cx"> A4226E961163D73A008B8397 /* DOMHTMLProgressElement.mm in Sources */,
</span><span class="cx"> 85183B4B0AA6926100F19FA3 /* DOMHTMLQuoteElement.mm in Sources */,
</span><span class="lines">@@ -28268,6 +28294,7 @@
</span><span class="cx"> 8AD0A59714C88358000D83C5 /* DOMWebKitCSSRegionRule.mm in Sources */,
</span><span class="cx"> 31611E620E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm in Sources */,
</span><span class="cx"> 3F2B33EC165AF15600E3987C /* DOMWebKitCSSViewportRule.mm in Sources */,
</span><ins>+ 7C91A38F1B498ABE003F9EFA /* JSNodeOrString.cpp in Sources */,
</ins><span class="cx"> 8A195933147EA16E00D1EA61 /* DOMWebKitNamedFlow.mm in Sources */,
</span><span class="cx"> 31C0FF4D0E4CEFDD007D6FE5 /* DOMWebKitTransitionEvent.mm in Sources */,
</span><span class="cx"> 85C7F5E80AAFBAFB004014DD /* DOMWheelEvent.mm in Sources */,
</span><span class="lines">@@ -29475,6 +29502,7 @@
</span><span class="cx"> BCE1C41C0D982981003B02F2 /* Location.cpp in Sources */,
</span><span class="cx"> A8239E0009B3CF8A00B60641 /* Logging.cpp in Sources */,
</span><span class="cx"> 1402645E0AFDC19B005919E2 /* LoggingMac.mm in Sources */,
</span><ins>+ 7C33F35A1B4A044800502CAF /* JSCharacterDataCustom.cpp in Sources */,
</ins><span class="cx"> 1A0409F31A43675C009E47F3 /* MachSendRight.cpp in Sources */,
</span><span class="cx"> 932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */,
</span><span class="cx"> 1A8F6BC50DB55CDC001DB794 /* ManifestParser.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include "JSCallbackData.cpp"
</span><span class="cx"> #include "JSCanvasRenderingContext2DCustom.cpp"
</span><span class="cx"> #include "JSCanvasRenderingContextCustom.cpp"
</span><ins>+#include "JSCharacterDataCustom.cpp"
</ins><span class="cx"> #include "JSCommandLineAPIHostCustom.cpp"
</span><span class="cx"> #include "JSCryptoCustom.cpp"
</span><span class="cx"> #include "JSCustomSQLStatementErrorCallback.cpp"
</span><span class="lines">@@ -66,6 +67,8 @@
</span><span class="cx"> #include "JSDeviceOrientationEventCustom.cpp"
</span><span class="cx"> #include "JSDictionary.cpp"
</span><span class="cx"> #include "JSDocumentCustom.cpp"
</span><ins>+#include "JSDocumentFragmentCustom.cpp"
+#include "JSDocumentTypeCustom.cpp"
</ins><span class="cx"> #include "JSElementCustom.cpp"
</span><span class="cx"> #include "JSErrorHandler.cpp"
</span><span class="cx"> #include "JSEventCustom.cpp"
</span><span class="lines">@@ -109,6 +112,7 @@
</span><span class="cx"> #include "JSNodeFilterCustom.cpp"
</span><span class="cx"> #include "JSNodeIteratorCustom.cpp"
</span><span class="cx"> #include "JSNodeListCustom.cpp"
</span><ins>+#include "JSNodeOrString.cpp"
</ins><span class="cx"> #include "JSPluginElementFunctions.cpp"
</span><span class="cx"> #include "JSPopStateEventCustom.cpp"
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCharacterDataCustomcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/bindings/js/JSCharacterDataCustom.cpp (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCharacterDataCustom.cpp (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSCharacterDataCustom.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "JSCharacterData.h"
+
+#include "ExceptionCode.h"
+#include "JSNodeOrString.h"
+
+using namespace JSC;
+
+namespace WebCore {
+
+JSValue JSCharacterData::before(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().before(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+JSValue JSCharacterData::after(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().after(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+JSValue JSCharacterData::replaceWith(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().replaceWith(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -28,11 +28,12 @@
</span><span class="cx"> #include "JSDOMWindowCustom.h"
</span><span class="cx"> #include "JSHTMLDocument.h"
</span><span class="cx"> #include "JSLocation.h"
</span><ins>+#include "JSNodeOrString.h"
</ins><span class="cx"> #include "JSSVGDocument.h"
</span><span class="cx"> #include "Location.h"
</span><span class="cx"> #include "NodeTraversal.h"
</span><ins>+#include "SVGDocument.h"
</ins><span class="cx"> #include "ScriptController.h"
</span><del>-#include "SVGDocument.h"
</del><span class="cx"> #include "TouchList.h"
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -117,6 +118,24 @@
</span><span class="cx"> return wrapper;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSValue JSDocument::prepend(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().prepend(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+JSValue JSDocument::append(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().append(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> JSValue JSDocument::createTouchList(ExecState* exec)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentFragmentCustomcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "JSDocumentFragment.h"
+
+#include "ExceptionCode.h"
+#include "JSNodeOrString.h"
+
+using namespace JSC;
+
+namespace WebCore {
+
+JSValue JSDocumentFragment::prepend(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().prepend(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+JSValue JSDocumentFragment::append(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().append(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentTypeCustomcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/bindings/js/JSDocumentTypeCustom.cpp (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentTypeCustom.cpp (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSDocumentTypeCustom.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "JSDocumentType.h"
+
+#include "ExceptionCode.h"
+#include "JSNodeOrString.h"
+
+using namespace JSC;
+
+namespace WebCore {
+
+JSValue JSDocumentType::before(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().before(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+JSValue JSDocumentType::after(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().after(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+JSValue JSDocumentType::replaceWith(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().replaceWith(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSElementCustom.cpp (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSElementCustom.cpp 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/bindings/js/JSElementCustom.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include "JSHTMLElementWrapperFactory.h"
</span><span class="cx"> #include "JSNodeList.h"
</span><ins>+#include "JSNodeOrString.h"
</ins><span class="cx"> #include "JSSVGElementWrapperFactory.h"
</span><span class="cx"> #include "NodeList.h"
</span><span class="cx"> #include "SVGElement.h"
</span><span class="lines">@@ -66,4 +67,49 @@
</span><span class="cx"> return wrapper;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSValue JSElement::before(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().before(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+JSValue JSElement::after(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().after(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+JSValue JSElement::replaceWith(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().replaceWith(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+JSValue JSElement::prepend(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().prepend(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
+JSValue JSElement::append(ExecState* state)
+{
+ ExceptionCode ec = 0;
+ impl().append(toNodeOrStringVector(*state), ec);
+ setDOMException(state, ec);
+
+ return jsUndefined();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeOrStringcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/bindings/js/JSNodeOrString.cpp (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeOrString.cpp (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSNodeOrString.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "JSNodeOrString.h"
+
+#include "JSNode.h"
+#include <JavaScriptCore/JSString.h>
+
+using namespace JSC;
+
+namespace WebCore {
+
+Vector<NodeOrString> toNodeOrStringVector(ExecState& state)
+{
+ size_t argumentCount = state.argumentCount();
+
+ Vector<NodeOrString> result;
+ result.reserveInitialCapacity(argumentCount);
+
+ for (size_t i = 0; i < argumentCount; ++i) {
+ JSValue value = state.uncheckedArgument(i);
+ if (auto* node = jsDynamicCast<JSNode*>(value))
+ result.uncheckedAppend(&node->impl());
+ else {
+ String string = value.toWTFString(&state);
+ if (state.hadException())
+ return { };
+ result.uncheckedAppend(string);
+ }
+ }
+
+ return result;
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeOrStringh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/bindings/js/JSNodeOrString.h (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeOrString.h (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSNodeOrString.h 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef JSNodeOrString_h
+#define JSNodeOrString_h
+
+#include "NodeOrString.h"
+#include <wtf/Vector.h>
+
+namespace JSC {
+class ExecState;
+}
+
+namespace WebCore {
+
+Vector<NodeOrString> toNodeOrStringVector(JSC::ExecState&);
+
+} // namespace WebCore
+
+#endif // JSNodeOrStringVector_h
</ins></span></pre></div>
<a id="trunkSourceWebCoredomChildNodeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ChildNode.idl (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ChildNode.idl 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/dom/ChildNode.idl 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -18,16 +18,14 @@
</span><span class="cx"> * Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// DOM 4
</del><ins>+// https://dom.spec.whatwg.org/#childnode
</ins><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> ] interface ChildNode {
</span><del>- // readonly attribute Element? previousElementSibling;
- // readonly attribute Element? nextElementSibling;
-
- // void before((Node or DOMString)... nodes);
- // void after((Node or DOMString)... nodes);
- // void replace((Node or DOMString)... nodes);
- [RaisesException] void remove();
</del><ins>+#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
+ [Unscopeable, RaisesException, Custom] void before((Node or DOMString)... nodes);
+ [Unscopeable, RaisesException, Custom] void after((Node or DOMString)... nodes);
+ [Unscopeable, RaisesException, Custom] void replaceWith((Node or DOMString)... nodes);
+#endif
+ [Unscopeable, RaisesException] void remove();
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include "LabelsNodeList.h"
</span><span class="cx"> #include "MutationEvent.h"
</span><span class="cx"> #include "NameNodeList.h"
</span><ins>+#include "NodeOrString.h"
</ins><span class="cx"> #include "NodeRareData.h"
</span><span class="cx"> #include "NodeRenderStyle.h"
</span><span class="cx"> #include "RadioNodeList.h"
</span><span class="lines">@@ -920,6 +921,24 @@
</span><span class="cx"> return std::distance(children.begin(), children.end());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ContainerNode::append(Vector<NodeOrString>&& nodeOrStringVector, ExceptionCode& ec)
+{
+ RefPtr<Node> node = convertNodesOrStringsIntoNode(*this, WTF::move(nodeOrStringVector), ec);
+ if (ec || !node)
+ return;
+
+ appendChild(node.release(), ec);
+}
+
+void ContainerNode::prepend(Vector<NodeOrString>&& nodeOrStringVector, ExceptionCode& ec)
+{
+ RefPtr<Node> node = convertNodesOrStringsIntoNode(*this, WTF::move(nodeOrStringVector), ec);
+ if (ec || !node)
+ return;
+
+ insertBefore(node.release(), firstChild(), ec);
+}
+
</ins><span class="cx"> Ref<HTMLCollection> ContainerNode::ensureCachedHTMLCollection(CollectionType type)
</span><span class="cx"> {
</span><span class="cx"> if (HTMLCollection* collection = cachedHTMLCollection(type))
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class HTMLCollection;
</span><ins>+class NodeOrString;
</ins><span class="cx"> class QualifiedName;
</span><span class="cx"> class RenderElement;
</span><span class="cx">
</span><span class="lines">@@ -152,6 +153,8 @@
</span><span class="cx"> Element* firstElementChild() const;
</span><span class="cx"> Element* lastElementChild() const;
</span><span class="cx"> unsigned childElementCount() const;
</span><ins>+ void append(Vector<NodeOrString>&&, ExceptionCode&);
+ void prepend(Vector<NodeOrString>&&, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit ContainerNode(Document&, ConstructionType = CreateContainer);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMAllInOne.cpp (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMAllInOne.cpp 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/dom/DOMAllInOne.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx"> #include "NodeFilter.cpp"
</span><span class="cx"> #include "NodeFilterCondition.cpp"
</span><span class="cx"> #include "NodeIterator.cpp"
</span><ins>+#include "NodeOrString.cpp"
</ins><span class="cx"> #include "NodeRareData.cpp"
</span><span class="cx"> #include "NodeRenderingTraversal.cpp"
</span><span class="cx"> #include "NodeTraversal.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/dom/Node.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -28,15 +28,15 @@
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "Attr.h"
</span><span class="cx"> #include "BeforeLoadEvent.h"
</span><del>-#include "ChildListMutationScope.h"
-#include "Chrome.h"
-#include "ChromeClient.h"
</del><span class="cx"> #include "CSSParser.h"
</span><span class="cx"> #include "CSSRule.h"
</span><span class="cx"> #include "CSSSelector.h"
</span><span class="cx"> #include "CSSSelectorList.h"
</span><span class="cx"> #include "CSSStyleRule.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><ins>+#include "ChildListMutationScope.h"
+#include "Chrome.h"
+#include "ChromeClient.h"
</ins><span class="cx"> #include "ContainerNodeAlgorithms.h"
</span><span class="cx"> #include "ContextMenuController.h"
</span><span class="cx"> #include "DOMImplementation.h"
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #include "KeyboardEvent.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "MutationEvent.h"
</span><ins>+#include "NodeOrString.h"
</ins><span class="cx"> #include "NodeRenderStyle.h"
</span><span class="cx"> #include "PlatformMouseEvent.h"
</span><span class="cx"> #include "PlatformWheelEvent.h"
</span><span class="lines">@@ -474,6 +475,96 @@
</span><span class="cx"> return downcast<ContainerNode>(*this).appendChild(newChild, ec);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static HashSet<RefPtr<Node>> nodeSetPreTransformedFromNodeOrStringVector(const Vector<NodeOrString>& nodeOrStringVector)
+{
+ HashSet<RefPtr<Node>> nodeSet;
+ for (auto& nodeOrString : nodeOrStringVector) {
+ switch (nodeOrString.type()) {
+ case NodeOrString::Type::String:
+ break;
+ case NodeOrString::Type::Node:
+ nodeSet.add(&nodeOrString.node());
+ break;
+ }
+ }
+
+ return nodeSet;
+}
+
+static RefPtr<Node> firstPrecedingSiblingNotInNodeSet(Node& context, const HashSet<RefPtr<Node>>& nodeSet)
+{
+ for (auto* sibling = context.previousSibling(); sibling; sibling = sibling->previousSibling()) {
+ if (!nodeSet.contains(sibling))
+ return sibling;
+ }
+ return nullptr;
+}
+
+static RefPtr<Node> firstFollowingSiblingNotInNodeSet(Node& context, const HashSet<RefPtr<Node>>& nodeSet)
+{
+ for (auto* sibling = context.nextSibling(); sibling; sibling = sibling->nextSibling()) {
+ if (!nodeSet.contains(sibling))
+ return sibling;
+ }
+ return nullptr;
+}
+
+void Node::before(Vector<NodeOrString>&& nodeOrStringVector, ExceptionCode& ec)
+{
+ RefPtr<ContainerNode> parent = parentNode();
+ if (!parent)
+ return;
+
+ auto nodeSet = nodeSetPreTransformedFromNodeOrStringVector(nodeOrStringVector);
+ auto viablePreviousSibling = firstPrecedingSiblingNotInNodeSet(*this, nodeSet);
+
+ auto node = convertNodesOrStringsIntoNode(*this, WTF::move(nodeOrStringVector), ec);
+ if (ec || !node)
+ return;
+
+ if (viablePreviousSibling)
+ viablePreviousSibling = viablePreviousSibling->nextSibling();
+ else
+ viablePreviousSibling = parent->firstChild();
+
+ parent->insertBefore(node.release(), viablePreviousSibling.get(), ec);
+}
+
+void Node::after(Vector<NodeOrString>&& nodeOrStringVector, ExceptionCode& ec)
+{
+ RefPtr<ContainerNode> parent = parentNode();
+ if (!parent)
+ return;
+
+ auto nodeSet = nodeSetPreTransformedFromNodeOrStringVector(nodeOrStringVector);
+ auto viableNextSibling = firstFollowingSiblingNotInNodeSet(*this, nodeSet);
+
+ auto node = convertNodesOrStringsIntoNode(*this, WTF::move(nodeOrStringVector), ec);
+ if (ec || !node)
+ return;
+
+ parent->insertBefore(node.release(), viableNextSibling.get(), ec);
+}
+
+void Node::replaceWith(Vector<NodeOrString>&& nodeOrStringVector, ExceptionCode& ec)
+{
+ RefPtr<ContainerNode> parent = parentNode();
+ if (!parent)
+ return;
+
+ auto nodeSet = nodeSetPreTransformedFromNodeOrStringVector(nodeOrStringVector);
+ auto viableNextSibling = firstFollowingSiblingNotInNodeSet(*this, nodeSet);
+
+ auto node = convertNodesOrStringsIntoNode(*this, WTF::move(nodeOrStringVector), ec);
+ if (ec || !node)
+ return;
+
+ if (parentNode() == parent)
+ parent->replaceChild(node.release(), this, ec);
+ else
+ parent->insertBefore(node.release(), viableNextSibling.get(), ec);
+}
+
</ins><span class="cx"> void Node::remove(ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (ContainerNode* parent = parentNode())
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/dom/Node.h 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -58,10 +58,11 @@
</span><span class="cx"> class KeyboardEvent;
</span><span class="cx"> class MathMLQualifiedName;
</span><span class="cx"> class NSResolver;
</span><ins>+class NameNodeList;
</ins><span class="cx"> class NamedNodeMap;
</span><del>-class NameNodeList;
</del><span class="cx"> class NodeList;
</span><span class="cx"> class NodeListsNodeData;
</span><ins>+class NodeOrString;
</ins><span class="cx"> class NodeRareData;
</span><span class="cx"> class QualifiedName;
</span><span class="cx"> class RadioNodeList;
</span><span class="lines">@@ -193,7 +194,6 @@
</span><span class="cx"> WEBCORE_EXPORT bool removeChild(Node* child, ExceptionCode&);
</span><span class="cx"> WEBCORE_EXPORT bool appendChild(PassRefPtr<Node> newChild, ExceptionCode&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void remove(ExceptionCode&);
</del><span class="cx"> bool hasChildNodes() const { return firstChild(); }
</span><span class="cx">
</span><span class="cx"> enum class CloningOperation {
</span><span class="lines">@@ -227,6 +227,12 @@
</span><span class="cx"> Element* previousElementSibling() const;
</span><span class="cx"> Element* nextElementSibling() const;
</span><span class="cx">
</span><ins>+ // From the ChildNode - https://dom.spec.whatwg.org/#childnode
+ void before(Vector<NodeOrString>&&, ExceptionCode&);
+ void after(Vector<NodeOrString>&&, ExceptionCode&);
+ void replaceWith(Vector<NodeOrString>&&, ExceptionCode&);
+ WEBCORE_EXPORT void remove(ExceptionCode&);
+
</ins><span class="cx"> // Other methods (not part of DOM)
</span><span class="cx">
</span><span class="cx"> bool isElementNode() const { return getFlag(IsElementFlag); }
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeOrStringcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/dom/NodeOrString.cpp (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeOrString.cpp (rev 0)
+++ trunk/Source/WebCore/dom/NodeOrString.cpp 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NodeOrString.h"
+
+#include "DocumentFragment.h"
+#include "Text.h"
+
+namespace WebCore {
+
+RefPtr<Node> convertNodesOrStringsIntoNode(Node& context, Vector<NodeOrString>&& nodeOrStringVector, ExceptionCode& ec)
+{
+ if (nodeOrStringVector.isEmpty())
+ return nullptr;
+
+ Vector<RefPtr<Node>> nodes;
+ nodes.reserveInitialCapacity(nodeOrStringVector.size());
+ for (auto& nodeOrString : nodeOrStringVector) {
+ switch (nodeOrString.type()) {
+ case NodeOrString::Type::String:
+ nodes.uncheckedAppend(Text::create(context.document(), nodeOrString.string()));
+ break;
+ case NodeOrString::Type::Node:
+ nodes.uncheckedAppend(&nodeOrString.node());
+ break;
+ }
+ }
+
+ RefPtr<Node> nodeToReturn;
+ if (nodes.size() == 1)
+ nodeToReturn = nodes.first();
+ else {
+ nodeToReturn = DocumentFragment::create(context.document());
+ for (auto& node : nodes) {
+ nodeToReturn->appendChild(node, ec);
+ if (ec)
+ return nullptr;
+ }
+ }
+
+ return WTF::move(nodeToReturn);
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoredomNodeOrStringh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/dom/NodeOrString.h (0 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeOrString.h (rev 0)
+++ trunk/Source/WebCore/dom/NodeOrString.h 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -0,0 +1,163 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef NodeOrString_h
+#define NodeOrString_h
+
+#include "Node.h"
+#include <wtf/StdLibExtras.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class NodeOrString {
+public:
+ enum class Type {
+ String,
+ Node
+ };
+
+ NodeOrString(const String& string)
+ : m_type(Type::String)
+ {
+ m_data.string = string.impl();
+ m_data.string->ref();
+ }
+
+ NodeOrString(Node* node)
+ : m_type(Type::Node)
+ {
+ m_data.node = node;
+ m_data.node->ref();
+ }
+
+ NodeOrString(const NodeOrString& other)
+ : m_type(other.m_type)
+ {
+ switch (m_type) {
+ case Type::String:
+ m_data.string = other.m_data.string;
+ m_data.string->ref();
+ break;
+ case Type::Node:
+ m_data.node = other.m_data.node;
+ m_data.node->ref();
+ break;
+ }
+ }
+
+ NodeOrString(NodeOrString&& other)
+ : m_type(other.m_type)
+ {
+ switch (m_type) {
+ case Type::String:
+ m_data.string = std::exchange(other.m_data.string, nullptr);
+ break;
+ case Type::Node:
+ m_data.node = std::exchange(other.m_data.node, nullptr);
+ break;
+ }
+ }
+
+ NodeOrString& operator=(const NodeOrString& other)
+ {
+ if (this == &other)
+ return *this;
+
+ derefData();
+
+ m_type = other.m_type;
+ switch (m_type) {
+ case Type::String:
+ m_data.string = other.m_data.string;
+ m_data.string->ref();
+ break;
+ case Type::Node:
+ m_data.node = other.m_data.node;
+ m_data.node->ref();
+ break;
+ }
+
+ return *this;
+ }
+
+ NodeOrString& operator=(NodeOrString&& other)
+ {
+ if (this == &other)
+ return *this;
+
+ derefData();
+
+ m_type = other.m_type;
+ switch (m_type) {
+ case Type::String:
+ m_data.string = std::exchange(other.m_data.string, nullptr);
+ break;
+ case Type::Node:
+ m_data.node = std::exchange(other.m_data.node, nullptr);
+ break;
+ }
+
+ return *this;
+ }
+
+ ~NodeOrString()
+ {
+ derefData();
+ }
+
+ Type type() const { return m_type; }
+
+ Node& node() const { ASSERT(m_type == Type::Node); ASSERT(m_data.node); return *m_data.node; }
+ StringImpl& string() const { ASSERT(m_type == Type::String); ASSERT(m_data.string); return *m_data.string; }
+
+private:
+ void derefData()
+ {
+ switch (m_type) {
+ case Type::String:
+ if (m_data.string)
+ m_data.string->deref();
+ break;
+ case Type::Node:
+ if (m_data.node)
+ m_data.node->deref();
+ break;
+ }
+ }
+
+ Type m_type;
+ union {
+ StringImpl* string;
+ Node* node;
+ } m_data;
+};
+
+RefPtr<Node> convertNodesOrStringsIntoNode(Node& context, Vector<NodeOrString>&&, ExceptionCode&);
+
+} // namespace WebCore
+
+#endif // NodeOrString_h
</ins></span></pre></div>
<a id="trunkSourceWebCoredomParentNodeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ParentNode.idl (186802 => 186803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ParentNode.idl 2015-07-14 15:35:48 UTC (rev 186802)
+++ trunk/Source/WebCore/dom/ParentNode.idl 2015-07-14 15:58:05 UTC (rev 186803)
</span><span class="lines">@@ -33,6 +33,13 @@
</span><span class="cx"> readonly attribute Element lastElementChild;
</span><span class="cx"> readonly attribute unsigned long childElementCount;
</span><span class="cx">
</span><ins>+#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
+ [Unscopeable, RaisesException, Custom] void prepend((Node or DOMString)... nodes);
+ [Unscopeable, RaisesException, Custom] void append((Node or DOMString)... nodes);
+#endif
+
+ // [Unscopeable] Element? query(DOMString relativeSelectors);
+ // [NewObject, Unscopeable] Elements queryAll(DOMString relativeSelectors);
</ins><span class="cx"> [RaisesException] Element querySelector(DOMString selectors);
</span><span class="cx"> [RaisesException] NodeList querySelectorAll(DOMString selectors);
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>