<!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>[177372] 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/177372">177372</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-16 11:08:54 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Nested template contents are not cloned by document.importNode
https://bugs.webkit.org/show_bug.cgi?id=137619
Reviewed by Andreas Kling.
Source/WebCore:
The bug was caused by Document.importNode not cloning HTMLTemplateElement's content.
Fixed the bug by sharing code between Document::importNode and Node::cloneNode by
generalizing Node::cloneNodeInternal, added in <a href="http://trac.webkit.org/projects/webkit/changeset/177314">r177314</a>, by taking the owner document
as an argument. The most of code changes are the result of adding this argument.
Document::importNode is the only function in which the actual logic changes.
Note that the code to import TEXT_NODE, CDATA_SECTION_NODE, ENTITY_REFERENCE_NODE,
PROCESSING_INSTRUCTION_NODE and COMMENT_NODE nodes are identical to that of cloneNode.
This patch removes the call to hasValidNamespaceForElements in ELEMENT_NODE but this
should not introduce an observable behavior change since all instantiated elements
should have a valid namespace in the first place.
Because DOCUMENT_NODE and DOCUMENT_TYPE_NODE cannot be imported and DOCUMENT_TYPE_NODE
can only appear as a direct child of DOCUMENT_NODE, neither nodes nor unimplemented
XPATH_NAMESPACE_NODE and XPATH_NAMESPACE_NODE can appear inside the recursive calls
for ELEMENT_NODE and DOCUMENT_FRAGMENT_NODE nodes.
While importNode behaves differently from cloneNode for ATTRIBUTE_NODE, namely that
it merges all of its child nodes, this behavior isn't present when recursing inside
ELEMENT_NODE and DOCUMENT_FRAGMENT_NODE since we are using cloneDataFromElement.
Thus there should be no observable behavior changes for DOCUMENT_FRAGMENT_NODE and
ELEMENT_NODE nodes either.
Test: fast/dom/HTMLTemplateElement/importNode-nested-templates.html
* dom/Attr.cpp:
(WebCore::Attr::cloneNodeInternal):
* dom/Attr.h:
* dom/CDATASection.cpp:
(WebCore::CDATASection::cloneNodeInternal):
* dom/CDATASection.h:
* dom/Comment.cpp:
(WebCore::Comment::cloneNodeInternal):
* dom/Comment.h:
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::cloneChildNodes):
* dom/Document.cpp:
(WebCore::Document::importNode):
(WebCore::Document::cloneNodeInternal):
* dom/Document.h:
* dom/DocumentFragment.cpp:
(WebCore::DocumentFragment::cloneNodeInternal):
* dom/DocumentFragment.h:
* dom/DocumentType.cpp:
(WebCore::DocumentType::cloneNodeInternal):
* dom/DocumentType.h:
* dom/Element.cpp:
(WebCore::Element::cloneNodeInternal):
(WebCore::Element::cloneElementWithChildren):
(WebCore::Element::cloneElementWithoutChildren):
(WebCore::Element::cloneElementWithoutAttributesAndChildren):
* dom/Element.h:
* dom/EntityReference.cpp:
(WebCore::EntityReference::cloneNodeInternal):
* dom/EntityReference.h:
* dom/Node.h:
(WebCore::Node::cloneNode):
* dom/ProcessingInstruction.cpp:
(WebCore::ProcessingInstruction::cloneNodeInternal):
* dom/ProcessingInstruction.h:
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::cloneNodeInternal):
* dom/ShadowRoot.h:
* dom/Text.cpp:
(WebCore::Text::cloneNodeInternal):
* dom/Text.h:
* editing/ApplyStyleCommand.cpp:
(WebCore::ApplyStyleCommand::pushDownInlineStyleAroundNode):
(WebCore::ApplyStyleCommand::applyInlineStyleChange):
* editing/BreakBlockquoteCommand.cpp:
(WebCore::BreakBlockquoteCommand::doApply):
* editing/InsertParagraphSeparatorCommand.cpp:
(WebCore::InsertParagraphSeparatorCommand::cloneHierarchyUnderNewBlock):
(WebCore::InsertParagraphSeparatorCommand::doApply):
* editing/ModifySelectionListLevel.cpp:
(WebCore::IncreaseSelectionListLevelCommand::doApply):
* editing/SplitElementCommand.cpp:
(WebCore::SplitElementCommand::doApply):
* editing/markup.cpp:
(WebCore::createFragmentFromText):
* html/HTMLKeygenElement.cpp:
* html/HTMLScriptElement.cpp:
(WebCore::HTMLScriptElement::cloneElementWithoutAttributesAndChildren):
* html/HTMLScriptElement.h:
* html/HTMLTemplateElement.cpp:
(WebCore::HTMLTemplateElement::cloneNodeInternal):
* html/HTMLTemplateElement.h:
* html/shadow/SliderThumbElement.cpp:
(WebCore::SliderThumbElement::cloneElementWithoutAttributesAndChildren):
* html/shadow/SliderThumbElement.h:
* html/track/WebVTTElement.cpp:
(WebCore::WebVTTElement::cloneElementWithoutAttributesAndChildren):
* html/track/WebVTTElement.h:
* svg/SVGScriptElement.cpp:
(WebCore::SVGScriptElement::cloneElementWithoutAttributesAndChildren):
* svg/SVGScriptElement.h:
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::buildShadowTree):
(WebCore::SVGUseElement::expandUseElementsInShadowTree):
LayoutTests:
Added a regression test.
* fast/dom/HTMLTemplateElement/importNode-nested-templates-expected.txt: Added.
* fast/dom/HTMLTemplateElement/importNode-nested-templates.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomAttrcpp">trunk/Source/WebCore/dom/Attr.cpp</a></li>
<li><a href="#trunkSourceWebCoredomAttrh">trunk/Source/WebCore/dom/Attr.h</a></li>
<li><a href="#trunkSourceWebCoredomCDATASectioncpp">trunk/Source/WebCore/dom/CDATASection.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCDATASectionh">trunk/Source/WebCore/dom/CDATASection.h</a></li>
<li><a href="#trunkSourceWebCoredomCommentcpp">trunk/Source/WebCore/dom/Comment.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCommenth">trunk/Source/WebCore/dom/Comment.h</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentFragmentcpp">trunk/Source/WebCore/dom/DocumentFragment.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentFragmenth">trunk/Source/WebCore/dom/DocumentFragment.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentTypecpp">trunk/Source/WebCore/dom/DocumentType.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentTypeh">trunk/Source/WebCore/dom/DocumentType.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomEntityReferencecpp">trunk/Source/WebCore/dom/EntityReference.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEntityReferenceh">trunk/Source/WebCore/dom/EntityReference.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredomProcessingInstructioncpp">trunk/Source/WebCore/dom/ProcessingInstruction.cpp</a></li>
<li><a href="#trunkSourceWebCoredomProcessingInstructionh">trunk/Source/WebCore/dom/ProcessingInstruction.h</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRooth">trunk/Source/WebCore/dom/ShadowRoot.h</a></li>
<li><a href="#trunkSourceWebCoredomTextcpp">trunk/Source/WebCore/dom/Text.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTexth">trunk/Source/WebCore/dom/Text.h</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyStyleCommandcpp">trunk/Source/WebCore/editing/ApplyStyleCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingBreakBlockquoteCommandcpp">trunk/Source/WebCore/editing/BreakBlockquoteCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertParagraphSeparatorCommandcpp">trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingModifySelectionListLevelcpp">trunk/Source/WebCore/editing/ModifySelectionListLevel.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingSplitElementCommandcpp">trunk/Source/WebCore/editing/SplitElementCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingmarkupcpp">trunk/Source/WebCore/editing/markup.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLKeygenElementcpp">trunk/Source/WebCore/html/HTMLKeygenElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLScriptElementcpp">trunk/Source/WebCore/html/HTMLScriptElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLScriptElementh">trunk/Source/WebCore/html/HTMLScriptElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTemplateElementcpp">trunk/Source/WebCore/html/HTMLTemplateElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTemplateElementh">trunk/Source/WebCore/html/HTMLTemplateElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSliderThumbElementcpp">trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSliderThumbElementh">trunk/Source/WebCore/html/shadow/SliderThumbElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackWebVTTElementcpp">trunk/Source/WebCore/html/track/WebVTTElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackWebVTTElementh">trunk/Source/WebCore/html/track/WebVTTElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGScriptElementcpp">trunk/Source/WebCore/svg/SVGScriptElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGScriptElementh">trunk/Source/WebCore/svg/SVGScriptElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementcpp">trunk/Source/WebCore/svg/SVGUseElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLTemplateElementimportNodenestedtemplatesexpectedtxt">trunk/LayoutTests/fast/dom/HTMLTemplateElement/importNode-nested-templates-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLTemplateElementimportNodenestedtemplateshtml">trunk/LayoutTests/fast/dom/HTMLTemplateElement/importNode-nested-templates.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/LayoutTests/ChangeLog 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-12-16 Ryosuke Niwa <rniwa@webkit.org>
+
+ Nested template contents are not cloned by document.importNode
+ https://bugs.webkit.org/show_bug.cgi?id=137619
+
+ Reviewed by Andreas Kling.
+
+ Added a regression test.
+
+ * fast/dom/HTMLTemplateElement/importNode-nested-templates-expected.txt: Added.
+ * fast/dom/HTMLTemplateElement/importNode-nested-templates.html: Added.
+
</ins><span class="cx"> 2014-12-16 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit2 test expectations gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLTemplateElementimportNodenestedtemplatesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLTemplateElement/importNode-nested-templates-expected.txt (0 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLTemplateElement/importNode-nested-templates-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLTemplateElement/importNode-nested-templates-expected.txt 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+Test that template contents are cloned when the template element is imported via importNode
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+importedOuterTemplate = anotherDocument.importNode(outerTemplate, true)
+PASS outerTemplate.ownerDocument is document
+PASS importedOuterTemplate.ownerDocument is anotherDocument
+PASS importedOuterTemplate.content is not outerTemplate.content
+PASS importedOuterTemplate.content.childNodes.length is 1
+innerTemplate = outerTemplate.content.firstChild
+importedInnerTemplate = importedOuterTemplate.content.firstChild
+PASS importedInnerTemplate.outerHTML is innerTemplate.outerHTML
+PASS innerTemplate.ownerDocument is not importedInnerTemplate.ownerDocument
+PASS importedInnerTemplate.content is not innerTemplate.content
+PASS innerTemplate.content.childNodes.length is 1
+PASS importedInnerTemplate.content.childNodes.length is 1
+PASS innerTemplate.content.firstChild.outerHTML is importedInnerTemplate.content.firstChild.outerHTML
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLTemplateElementimportNodenestedtemplateshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLTemplateElement/importNode-nested-templates.html (0 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLTemplateElement/importNode-nested-templates.html (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLTemplateElement/importNode-nested-templates.html 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<template id="outerTemplate"><template id="innerTemplate"><span>Contents</span></template></template>
+<iframe></iframe>
+<script src="../../../resources/js-test-pre.js"></script>
+<script>
+
+description('Test that template contents are cloned when the template element is imported via importNode');
+
+if (!window.HTMLTemplateElement)
+ testFailed('This test requires ENABLE(TEMPLATE_ELEMENT)');
+
+var anotherDocument = document.querySelector('iframe').contentDocument;
+
+var outerTemplate = document.getElementById('outerTemplate');
+evalAndLog('importedOuterTemplate = anotherDocument.importNode(outerTemplate, true)');
+shouldBe('outerTemplate.ownerDocument', 'document');
+shouldBe('importedOuterTemplate.ownerDocument', 'anotherDocument');
+shouldNotBe('importedOuterTemplate.content', 'outerTemplate.content');
+shouldBe('importedOuterTemplate.content.childNodes.length', '1');
+evalAndLog('innerTemplate = outerTemplate.content.firstChild');
+evalAndLog('importedInnerTemplate = importedOuterTemplate.content.firstChild');
+shouldBe('importedInnerTemplate.outerHTML', 'innerTemplate.outerHTML');
+shouldNotBe('innerTemplate.ownerDocument', 'importedInnerTemplate.ownerDocument');
+shouldNotBe('importedInnerTemplate.content', 'innerTemplate.content');
+shouldBe('innerTemplate.content.childNodes.length', '1');
+shouldBe('importedInnerTemplate.content.childNodes.length', '1');
+shouldBe('innerTemplate.content.firstChild.outerHTML', 'importedInnerTemplate.content.firstChild.outerHTML');
+
+var successfullyParsed = true;
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/ChangeLog 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -1,3 +1,113 @@
</span><ins>+2014-12-16 Ryosuke Niwa <rniwa@webkit.org>
+
+ Nested template contents are not cloned by document.importNode
+ https://bugs.webkit.org/show_bug.cgi?id=137619
+
+ Reviewed by Andreas Kling.
+
+ The bug was caused by Document.importNode not cloning HTMLTemplateElement's content.
+
+ Fixed the bug by sharing code between Document::importNode and Node::cloneNode by
+ generalizing Node::cloneNodeInternal, added in r177314, by taking the owner document
+ as an argument. The most of code changes are the result of adding this argument.
+
+ Document::importNode is the only function in which the actual logic changes.
+ Note that the code to import TEXT_NODE, CDATA_SECTION_NODE, ENTITY_REFERENCE_NODE,
+ PROCESSING_INSTRUCTION_NODE and COMMENT_NODE nodes are identical to that of cloneNode.
+
+ This patch removes the call to hasValidNamespaceForElements in ELEMENT_NODE but this
+ should not introduce an observable behavior change since all instantiated elements
+ should have a valid namespace in the first place.
+
+ Because DOCUMENT_NODE and DOCUMENT_TYPE_NODE cannot be imported and DOCUMENT_TYPE_NODE
+ can only appear as a direct child of DOCUMENT_NODE, neither nodes nor unimplemented
+ XPATH_NAMESPACE_NODE and XPATH_NAMESPACE_NODE can appear inside the recursive calls
+ for ELEMENT_NODE and DOCUMENT_FRAGMENT_NODE nodes.
+
+ While importNode behaves differently from cloneNode for ATTRIBUTE_NODE, namely that
+ it merges all of its child nodes, this behavior isn't present when recursing inside
+ ELEMENT_NODE and DOCUMENT_FRAGMENT_NODE since we are using cloneDataFromElement.
+
+ Thus there should be no observable behavior changes for DOCUMENT_FRAGMENT_NODE and
+ ELEMENT_NODE nodes either.
+
+ Test: fast/dom/HTMLTemplateElement/importNode-nested-templates.html
+
+ * dom/Attr.cpp:
+ (WebCore::Attr::cloneNodeInternal):
+ * dom/Attr.h:
+ * dom/CDATASection.cpp:
+ (WebCore::CDATASection::cloneNodeInternal):
+ * dom/CDATASection.h:
+ * dom/Comment.cpp:
+ (WebCore::Comment::cloneNodeInternal):
+ * dom/Comment.h:
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::cloneChildNodes):
+ * dom/Document.cpp:
+ (WebCore::Document::importNode):
+ (WebCore::Document::cloneNodeInternal):
+ * dom/Document.h:
+ * dom/DocumentFragment.cpp:
+ (WebCore::DocumentFragment::cloneNodeInternal):
+ * dom/DocumentFragment.h:
+ * dom/DocumentType.cpp:
+ (WebCore::DocumentType::cloneNodeInternal):
+ * dom/DocumentType.h:
+ * dom/Element.cpp:
+ (WebCore::Element::cloneNodeInternal):
+ (WebCore::Element::cloneElementWithChildren):
+ (WebCore::Element::cloneElementWithoutChildren):
+ (WebCore::Element::cloneElementWithoutAttributesAndChildren):
+ * dom/Element.h:
+ * dom/EntityReference.cpp:
+ (WebCore::EntityReference::cloneNodeInternal):
+ * dom/EntityReference.h:
+ * dom/Node.h:
+ (WebCore::Node::cloneNode):
+ * dom/ProcessingInstruction.cpp:
+ (WebCore::ProcessingInstruction::cloneNodeInternal):
+ * dom/ProcessingInstruction.h:
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::cloneNodeInternal):
+ * dom/ShadowRoot.h:
+ * dom/Text.cpp:
+ (WebCore::Text::cloneNodeInternal):
+ * dom/Text.h:
+ * editing/ApplyStyleCommand.cpp:
+ (WebCore::ApplyStyleCommand::pushDownInlineStyleAroundNode):
+ (WebCore::ApplyStyleCommand::applyInlineStyleChange):
+ * editing/BreakBlockquoteCommand.cpp:
+ (WebCore::BreakBlockquoteCommand::doApply):
+ * editing/InsertParagraphSeparatorCommand.cpp:
+ (WebCore::InsertParagraphSeparatorCommand::cloneHierarchyUnderNewBlock):
+ (WebCore::InsertParagraphSeparatorCommand::doApply):
+ * editing/ModifySelectionListLevel.cpp:
+ (WebCore::IncreaseSelectionListLevelCommand::doApply):
+ * editing/SplitElementCommand.cpp:
+ (WebCore::SplitElementCommand::doApply):
+ * editing/markup.cpp:
+ (WebCore::createFragmentFromText):
+ * html/HTMLKeygenElement.cpp:
+ * html/HTMLScriptElement.cpp:
+ (WebCore::HTMLScriptElement::cloneElementWithoutAttributesAndChildren):
+ * html/HTMLScriptElement.h:
+ * html/HTMLTemplateElement.cpp:
+ (WebCore::HTMLTemplateElement::cloneNodeInternal):
+ * html/HTMLTemplateElement.h:
+ * html/shadow/SliderThumbElement.cpp:
+ (WebCore::SliderThumbElement::cloneElementWithoutAttributesAndChildren):
+ * html/shadow/SliderThumbElement.h:
+ * html/track/WebVTTElement.cpp:
+ (WebCore::WebVTTElement::cloneElementWithoutAttributesAndChildren):
+ * html/track/WebVTTElement.h:
+ * svg/SVGScriptElement.cpp:
+ (WebCore::SVGScriptElement::cloneElementWithoutAttributesAndChildren):
+ * svg/SVGScriptElement.h:
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::buildShadowTree):
+ (WebCore::SVGUseElement::expandUseElementsInShadowTree):
+
</ins><span class="cx"> 2014-12-16 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Document.contentType implementation
</span></span></pre></div>
<a id="trunkSourceWebCoredomAttrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Attr.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Attr.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Attr.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -137,9 +137,9 @@
</span><span class="cx"> setValue(v, ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> Attr::cloneNodeInternal(CloningOperation)
</del><ins>+RefPtr<Node> Attr::cloneNodeInternal(Document& targetDocument, CloningOperation)
</ins><span class="cx"> {
</span><del>- RefPtr<Attr> clone = adoptRef(new Attr(document(), qualifiedName(), value()));
</del><ins>+ RefPtr<Attr> clone = adoptRef(new Attr(targetDocument, qualifiedName(), value()));
</ins><span class="cx"> cloneChildNodes(clone.get());
</span><span class="cx"> return clone.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomAttrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Attr.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Attr.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Attr.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> virtual String nodeValue() const override { return value(); }
</span><span class="cx"> virtual void setNodeValue(const String&, ExceptionCode&) override;
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool isAttributeNode() const override { return true; }
</span><span class="cx"> virtual bool childTypeAllowed(NodeType) const override;
</span></span></pre></div>
<a id="trunkSourceWebCoredomCDATASectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CDATASection.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CDATASection.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/CDATASection.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> return CDATA_SECTION_NODE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> CDATASection::cloneNodeInternal(CloningOperation)
</del><ins>+RefPtr<Node> CDATASection::cloneNodeInternal(Document& targetDocument, CloningOperation)
</ins><span class="cx"> {
</span><del>- return create(document(), data());
</del><ins>+ return create(targetDocument, data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CDATASection::childTypeAllowed(NodeType) const
</span></span></pre></div>
<a id="trunkSourceWebCoredomCDATASectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CDATASection.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CDATASection.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/CDATASection.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> virtual String nodeName() const override;
</span><span class="cx"> virtual NodeType nodeType() const override;
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</ins><span class="cx"> virtual bool childTypeAllowed(NodeType) const override;
</span><span class="cx"> virtual RefPtr<Text> virtualCreate(const String&) override;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomCommentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Comment.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Comment.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Comment.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -51,9 +51,9 @@
</span><span class="cx"> return COMMENT_NODE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> Comment::cloneNodeInternal(CloningOperation)
</del><ins>+RefPtr<Node> Comment::cloneNodeInternal(Document& targetDocument, CloningOperation)
</ins><span class="cx"> {
</span><del>- return create(document(), data());
</del><ins>+ return create(targetDocument, data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Comment::childTypeAllowed(NodeType) const
</span></span></pre></div>
<a id="trunkSourceWebCoredomCommenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Comment.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Comment.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Comment.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> virtual String nodeName() const override;
</span><span class="cx"> virtual NodeType nodeType() const override;
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</ins><span class="cx"> virtual bool childTypeAllowed(NodeType) const override;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -765,11 +765,12 @@
</span><span class="cx"> invalidateNodeListAndCollectionCachesInAncestors();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ContainerNode::cloneChildNodes(ContainerNode *clone)
</del><ins>+void ContainerNode::cloneChildNodes(ContainerNode* clone)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><ins>+ Document& targetDocument = clone->document();
</ins><span class="cx"> for (Node* child = firstChild(); child && !ec; child = child->nextSibling()) {
</span><del>- RefPtr<Node> clonedChild = child->cloneNodeInternal(CloningOperation::SelfWithTemplateContent);
</del><ins>+ RefPtr<Node> clonedChild = child->cloneNodeInternal(targetDocument, CloningOperation::SelfWithTemplateContent);
</ins><span class="cx"> clone->appendChild(clonedChild, ec);
</span><span class="cx">
</span><span class="cx"> if (!ec && is<ContainerNode>(child))
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -923,78 +923,32 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Node> Document::importNode(Node* importedNode, bool deep, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- ec = 0;
-
</del><span class="cx"> if (!importedNode) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (importedNode->nodeType()) {
</span><ins>+ case ELEMENT_NODE:
</ins><span class="cx"> case TEXT_NODE:
</span><del>- return createTextNode(importedNode->nodeValue());
</del><span class="cx"> case CDATA_SECTION_NODE:
</span><del>- return createCDATASection(importedNode->nodeValue(), ec);
</del><span class="cx"> case ENTITY_REFERENCE_NODE:
</span><del>- return createEntityReference(importedNode->nodeName(), ec);
</del><span class="cx"> case PROCESSING_INSTRUCTION_NODE:
</span><del>- return createProcessingInstruction(importedNode->nodeName(), importedNode->nodeValue(), ec);
</del><span class="cx"> case COMMENT_NODE:
</span><del>- return createComment(importedNode->nodeValue());
- case ELEMENT_NODE: {
- Element& oldElement = downcast<Element>(*importedNode);
- // FIXME: The following check might be unnecessary. Is it possible that
- // oldElement has mismatched prefix/namespace?
- if (!hasValidNamespaceForElements(oldElement.tagQName())) {
- ec = NAMESPACE_ERR;
- return nullptr;
- }
</del><ins>+ case DOCUMENT_FRAGMENT_NODE:
+ return importedNode->cloneNodeInternal(document(), deep ? CloningOperation::Everything : CloningOperation::OnlySelf);
</ins><span class="cx">
</span><del>- RefPtr<Element> newElement = createElement(oldElement.tagQName(), false);
- newElement->cloneDataFromElement(oldElement);
-
- if (deep) {
- for (Node* oldChild = oldElement.firstChild(); oldChild; oldChild = oldChild->nextSibling()) {
- RefPtr<Node> newChild = importNode(oldChild, true, ec);
- if (ec)
- return nullptr;
- newElement->appendChild(newChild.release(), ec);
- if (ec)
- return nullptr;
- }
- }
-
- return newElement.release();
- }
</del><span class="cx"> case ATTRIBUTE_NODE:
</span><ins>+ // FIXME: This will "Attr::normalize" child nodes of Attr.
</ins><span class="cx"> return Attr::create(*this, QualifiedName(nullAtom, downcast<Attr>(*importedNode).name(), nullAtom), downcast<Attr>(*importedNode).value());
</span><del>- case DOCUMENT_FRAGMENT_NODE: {
- if (importedNode->isShadowRoot()) {
- // ShadowRoot nodes should not be explicitly importable.
- // Either they are imported along with their host node, or created implicitly.
- break;
- }
- DocumentFragment& oldFragment = downcast<DocumentFragment>(*importedNode);
- RefPtr<DocumentFragment> newFragment = createDocumentFragment();
- if (deep) {
- for (Node* oldChild = oldFragment.firstChild(); oldChild; oldChild = oldChild->nextSibling()) {
- RefPtr<Node> newChild = importNode(oldChild, true, ec);
- if (ec)
- return nullptr;
- newFragment->appendChild(newChild.release(), ec);
- if (ec)
- return nullptr;
- }
- }
-
- return newFragment.release();
- }
</del><ins>+
+ case DOCUMENT_NODE: // Can't import a document into another document.
+ case DOCUMENT_TYPE_NODE: // FIXME: Support cloning a DocumentType node per DOM4.
+ break;
+
</ins><span class="cx"> case ENTITY_NODE:
</span><del>- // FIXME: It should be possible to import these node types, however in DOM3 the DocumentType is readonly, so there isn't much sense in doing that.
- // Ability to add these imported nodes to a DocumentType will be considered for addition to a future release of the DOM.
- case DOCUMENT_NODE:
- case DOCUMENT_TYPE_NODE:
</del><span class="cx"> case XPATH_NAMESPACE_NODE:
</span><ins>+ ASSERT_NOT_REACHED(); // These two types of DOM nodes are not implemented.
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="lines">@@ -3207,7 +3161,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> Document::cloneNodeInternal(CloningOperation type)
</del><ins>+RefPtr<Node> Document::cloneNodeInternal(Document&, CloningOperation type)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Document> clone = cloneDocumentWithoutChildren();
</span><span class="cx"> clone->cloneDataFromDocument(*this);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Document.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -1311,7 +1311,7 @@
</span><span class="cx"> virtual String nodeName() const override final;
</span><span class="cx"> virtual NodeType nodeType() const override final;
</span><span class="cx"> virtual bool childTypeAllowed(NodeType) const override final;
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override final;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override final;
</ins><span class="cx"> void cloneDataFromDocument(const Document&);
</span><span class="cx">
</span><span class="cx"> virtual void refScriptExecutionContext() override final { ref(); }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentFragment.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentFragment.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/DocumentFragment.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -71,9 +71,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> DocumentFragment::cloneNodeInternal(CloningOperation type)
</del><ins>+RefPtr<Node> DocumentFragment::cloneNodeInternal(Document& targetDocument, CloningOperation type)
</ins><span class="cx"> {
</span><del>- RefPtr<DocumentFragment> clone = create(document());
</del><ins>+ RefPtr<DocumentFragment> clone = create(targetDocument);
</ins><span class="cx"> switch (type) {
</span><span class="cx"> case CloningOperation::OnlySelf:
</span><span class="cx"> case CloningOperation::SelfWithTemplateContent:
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentFragmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentFragment.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentFragment.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/DocumentFragment.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual NodeType nodeType() const override final;
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</ins><span class="cx"> virtual bool childTypeAllowed(NodeType) const override;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentType.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentType.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/DocumentType.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -51,9 +51,9 @@
</span><span class="cx"> return DOCUMENT_TYPE_NODE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> DocumentType::cloneNodeInternal(CloningOperation)
</del><ins>+RefPtr<Node> DocumentType::cloneNodeInternal(Document& documentTarget, CloningOperation)
</ins><span class="cx"> {
</span><del>- return create(document(), m_name, m_publicId, m_systemId);
</del><ins>+ return create(documentTarget, m_name, m_publicId, m_systemId);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentType.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentType.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/DocumentType.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> virtual URL baseURI() const override;
</span><span class="cx"> virtual String nodeName() const override;
</span><span class="cx"> virtual NodeType nodeType() const override;
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</ins><span class="cx">
</span><span class="cx"> String m_name;
</span><span class="cx"> String m_publicId;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -289,29 +289,29 @@
</span><span class="cx"> DEFINE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(Element, focus);
</span><span class="cx"> DEFINE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(Element, load);
</span><span class="cx">
</span><del>-RefPtr<Node> Element::cloneNodeInternal(CloningOperation type)
</del><ins>+RefPtr<Node> Element::cloneNodeInternal(Document& targetDocument, CloningOperation type)
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case CloningOperation::OnlySelf:
</span><span class="cx"> case CloningOperation::SelfWithTemplateContent:
</span><del>- return cloneElementWithoutChildren();
</del><ins>+ return cloneElementWithoutChildren(targetDocument);
</ins><span class="cx"> case CloningOperation::Everything:
</span><del>- return cloneElementWithChildren();
</del><ins>+ return cloneElementWithChildren(targetDocument);
</ins><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Element> Element::cloneElementWithChildren()
</del><ins>+RefPtr<Element> Element::cloneElementWithChildren(Document& targetDocument)
</ins><span class="cx"> {
</span><del>- RefPtr<Element> clone = cloneElementWithoutChildren();
</del><ins>+ RefPtr<Element> clone = cloneElementWithoutChildren(targetDocument);
</ins><span class="cx"> cloneChildNodes(clone.get());
</span><span class="cx"> return clone.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Element> Element::cloneElementWithoutChildren()
</del><ins>+RefPtr<Element> Element::cloneElementWithoutChildren(Document& targetDocument)
</ins><span class="cx"> {
</span><del>- RefPtr<Element> clone = cloneElementWithoutAttributesAndChildren();
</del><ins>+ RefPtr<Element> clone = cloneElementWithoutAttributesAndChildren(targetDocument);
</ins><span class="cx"> // This will catch HTML elements in the wrong namespace that are not correctly copied.
</span><span class="cx"> // This is a sanity check as HTML overloads some of the DOM methods.
</span><span class="cx"> ASSERT(isHTMLElement() == clone->isHTMLElement());
</span><span class="lines">@@ -320,9 +320,9 @@
</span><span class="cx"> return clone.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Element> Element::cloneElementWithoutAttributesAndChildren()
</del><ins>+RefPtr<Element> Element::cloneElementWithoutAttributesAndChildren(Document& targetDocument)
</ins><span class="cx"> {
</span><del>- return document().createElement(tagQName(), false);
</del><ins>+ return targetDocument.createElement(tagQName(), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Attr> Element::detachAttribute(unsigned index)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Element.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -267,8 +267,8 @@
</span><span class="cx">
</span><span class="cx"> virtual String nodeName() const override;
</span><span class="cx">
</span><del>- RefPtr<Element> cloneElementWithChildren();
- RefPtr<Element> cloneElementWithoutChildren();
</del><ins>+ RefPtr<Element> cloneElementWithChildren(Document&);
+ RefPtr<Element> cloneElementWithoutChildren(Document&);
</ins><span class="cx">
</span><span class="cx"> void normalizeAttributes();
</span><span class="cx"> String nodeNamePreservingCase() const;
</span><span class="lines">@@ -632,8 +632,8 @@
</span><span class="cx">
</span><span class="cx"> // cloneNode is private so that non-virtual cloneElementWithChildren and cloneElementWithoutChildren
</span><span class="cx"> // are used instead.
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
- virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren();
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
+ virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren(Document&);
</ins><span class="cx">
</span><span class="cx"> void addShadowRoot(PassRefPtr<ShadowRoot>);
</span><span class="cx"> void removeShadowRoot();
</span></span></pre></div>
<a id="trunkSourceWebCoredomEntityReferencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EntityReference.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EntityReference.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/EntityReference.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> return ENTITY_REFERENCE_NODE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> EntityReference::cloneNodeInternal(CloningOperation)
</del><ins>+RefPtr<Node> EntityReference::cloneNodeInternal(Document& targetDocument, CloningOperation)
</ins><span class="cx"> {
</span><del>- return create(document(), m_entityName);
</del><ins>+ return create(targetDocument, m_entityName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="trunkSourceWebCoredomEntityReferenceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EntityReference.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EntityReference.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/EntityReference.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> virtual String nodeName() const override;
</span><span class="cx"> virtual NodeType nodeType() const override;
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</ins><span class="cx">
</span><span class="cx"> String m_entityName;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Node.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -209,8 +209,8 @@
</span><span class="cx"> SelfWithTemplateContent,
</span><span class="cx"> Everything,
</span><span class="cx"> };
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) = 0;
- RefPtr<Node> cloneNode(bool deep) { return cloneNodeInternal(deep ? CloningOperation::Everything : CloningOperation::OnlySelf); }
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) = 0;
+ RefPtr<Node> cloneNode(bool deep) { return cloneNodeInternal(document(), deep ? CloningOperation::Everything : CloningOperation::OnlySelf); }
</ins><span class="cx">
</span><span class="cx"> virtual const AtomicString& localName() const;
</span><span class="cx"> virtual const AtomicString& namespaceURI() const;
</span></span></pre></div>
<a id="trunkSourceWebCoredomProcessingInstructioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ProcessingInstruction.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -79,11 +79,11 @@
</span><span class="cx"> return PROCESSING_INSTRUCTION_NODE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> ProcessingInstruction::cloneNodeInternal(CloningOperation)
</del><ins>+RefPtr<Node> ProcessingInstruction::cloneNodeInternal(Document& targetDocument, CloningOperation)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Is it a problem that this does not copy m_localHref?
</span><span class="cx"> // What about other data members?
</span><del>- return create(document(), m_target, data());
</del><ins>+ return create(targetDocument, m_target, data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ProcessingInstruction::checkStyleSheet()
</span></span></pre></div>
<a id="trunkSourceWebCoredomProcessingInstructionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ProcessingInstruction.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ProcessingInstruction.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/ProcessingInstruction.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> virtual String nodeName() const override;
</span><span class="cx"> virtual NodeType nodeType() const override;
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</ins><span class="cx">
</span><span class="cx"> virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;
</span><span class="cx"> virtual void removedFrom(ContainerNode&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> invalidateDistribution();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> ShadowRoot::cloneNodeInternal(CloningOperation)
</del><ins>+RefPtr<Node> ShadowRoot::cloneNodeInternal(Document&, CloningOperation)
</ins><span class="cx"> {
</span><span class="cx"> return nullptr; // ShadowRoots should never be cloned.
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/ShadowRoot.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> virtual bool childTypeAllowed(NodeType) const override;
</span><span class="cx"> virtual void childrenChanged(const ChildChange&) override;
</span><span class="cx">
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</ins><span class="cx">
</span><span class="cx"> // FIXME: This shouldn't happen. https://bugs.webkit.org/show_bug.cgi?id=88834
</span><span class="cx"> bool isOrphan() const { return !hostElement(); }
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Text.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -169,9 +169,9 @@
</span><span class="cx"> return TEXT_NODE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> Text::cloneNodeInternal(CloningOperation)
</del><ins>+RefPtr<Node> Text::cloneNodeInternal(Document& targetDocument, CloningOperation)
</ins><span class="cx"> {
</span><del>- return create(document(), data());
</del><ins>+ return create(targetDocument, data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isSVGShadowText(Text* text)
</span></span></pre></div>
<a id="trunkSourceWebCoredomTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/dom/Text.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual String nodeName() const override;
</span><span class="cx"> virtual NodeType nodeType() const override;
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</ins><span class="cx"> virtual bool childTypeAllowed(NodeType) const override;
</span><span class="cx">
</span><span class="cx"> virtual RefPtr<Text> virtualCreate(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyStyleCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -1060,7 +1060,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> if (!child.contains(targetNode) && elementsToPushDown.size()) {
</span><span class="cx"> for (size_t i = 0; i < elementsToPushDown.size(); i++) {
</span><del>- RefPtr<Element> wrapper = elementsToPushDown[i]->cloneElementWithoutChildren();
</del><ins>+ RefPtr<Element> wrapper = elementsToPushDown[i]->cloneElementWithoutChildren(document());
</ins><span class="cx"> wrapper->removeAttribute(styleAttr);
</span><span class="cx"> surroundNodeRangeWithElement(&child, &child, wrapper);
</span><span class="cx"> }
</span><span class="lines">@@ -1504,7 +1504,7 @@
</span><span class="cx"> surroundNodeRangeWithElement(startNode, endNode, createHTMLElement(document(), supTag));
</span><span class="cx">
</span><span class="cx"> if (m_styledInlineElement && addStyledElement == AddStyledElement)
</span><del>- surroundNodeRangeWithElement(startNode, endNode, m_styledInlineElement->cloneElementWithoutChildren());
</del><ins>+ surroundNodeRangeWithElement(startNode, endNode, m_styledInlineElement->cloneElementWithoutChildren(document()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float ApplyStyleCommand::computedFontSize(Node* node)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingBreakBlockquoteCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/BreakBlockquoteCommand.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/BreakBlockquoteCommand.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/editing/BreakBlockquoteCommand.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> ancestors.append(node);
</span><span class="cx">
</span><span class="cx"> // Insert a clone of the top blockquote after the break.
</span><del>- RefPtr<Element> clonedBlockquote = downcast<Element>(*topBlockquote).cloneElementWithoutChildren();
</del><ins>+ RefPtr<Element> clonedBlockquote = downcast<Element>(*topBlockquote).cloneElementWithoutChildren(document());
</ins><span class="cx"> insertNodeAfter(clonedBlockquote.get(), breakNode.get());
</span><span class="cx">
</span><span class="cx"> // Clone startNode's ancestors into the cloned blockquote.
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> // or clonedBlockquote if ancestors is empty).
</span><span class="cx"> RefPtr<Element> clonedAncestor = clonedBlockquote;
</span><span class="cx"> for (size_t i = ancestors.size(); i != 0; --i) {
</span><del>- RefPtr<Element> clonedChild = ancestors[i - 1]->cloneElementWithoutChildren();
</del><ins>+ RefPtr<Element> clonedChild = ancestors[i - 1]->cloneElementWithoutChildren(document());
</ins><span class="cx"> // Preserve list item numbering in cloned lists.
</span><span class="cx"> if (clonedChild->isElementNode() && clonedChild->hasTagName(olTag)) {
</span><span class="cx"> Node* listChildNode = i > 1 ? ancestors[i - 2].get() : startNode;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertParagraphSeparatorCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> // Make clones of ancestors in between the start node and the start block.
</span><span class="cx"> RefPtr<Element> parent = blockToInsert;
</span><span class="cx"> for (size_t i = ancestors.size(); i != 0; --i) {
</span><del>- RefPtr<Element> child = ancestors[i - 1]->cloneElementWithoutChildren();
</del><ins>+ RefPtr<Element> child = ancestors[i - 1]->cloneElementWithoutChildren(document());
</ins><span class="cx"> // It should always be okay to remove id from the cloned elements, since the originals are not deleted.
</span><span class="cx"> child->removeAttribute(idAttr);
</span><span class="cx"> appendNode(child, parent);
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> } else if (shouldUseDefaultParagraphElement(startBlock.get()))
</span><span class="cx"> blockToInsert = createDefaultParagraphElement(document());
</span><span class="cx"> else
</span><del>- blockToInsert = startBlock->cloneElementWithoutChildren();
</del><ins>+ blockToInsert = startBlock->cloneElementWithoutChildren(document());
</ins><span class="cx">
</span><span class="cx"> //---------------------------------------------------------------------
</span><span class="cx"> // Handle case when position is in the last visible position in its block,
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingModifySelectionListLevelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ModifySelectionListLevel.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ModifySelectionListLevel.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/editing/ModifySelectionListLevel.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> case InheritedListType:
</span><span class="cx"> newParent = startListChild->parentElement();
</span><span class="cx"> if (newParent)
</span><del>- newParent = newParent->cloneElementWithoutChildren();
</del><ins>+ newParent = newParent->cloneElementWithoutChildren(document());
</ins><span class="cx"> break;
</span><span class="cx"> case OrderedList:
</span><span class="cx"> newParent = createOrderedListElement(document());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSplitElementCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/SplitElementCommand.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SplitElementCommand.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/editing/SplitElementCommand.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> void SplitElementCommand::doApply()
</span><span class="cx"> {
</span><del>- m_element1 = m_element2->cloneElementWithoutChildren();
</del><ins>+ m_element1 = m_element2->cloneElementWithoutChildren(document());
</ins><span class="cx">
</span><span class="cx"> executeApply();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/markup.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/markup.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/editing/markup.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -798,7 +798,7 @@
</span><span class="cx"> fillContainerFromString(fragment.get(), s);
</span><span class="cx"> } else {
</span><span class="cx"> if (useClonesOfEnclosingBlock)
</span><del>- element = block->cloneElementWithoutChildren();
</del><ins>+ element = block->cloneElementWithoutChildren(document);
</ins><span class="cx"> else
</span><span class="cx"> element = createDefaultParagraphElement(document);
</span><span class="cx"> fillContainerFromString(element.get(), s);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLKeygenElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLKeygenElement.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLKeygenElement.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/html/HTMLKeygenElement.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren() override
</del><ins>+ virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren(Document& targetDocument) override
</ins><span class="cx"> {
</span><del>- return create(document());
</del><ins>+ return create(targetDocument);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLScriptElement.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLScriptElement.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/html/HTMLScriptElement.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -168,9 +168,9 @@
</span><span class="cx"> dispatchEvent(Event::create(eventNames().loadEvent, false, false));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Element> HTMLScriptElement::cloneElementWithoutAttributesAndChildren()
</del><ins>+RefPtr<Element> HTMLScriptElement::cloneElementWithoutAttributesAndChildren(Document& targetDocument)
</ins><span class="cx"> {
</span><del>- return adoptRef(new HTMLScriptElement(tagQName(), document(), false, alreadyStarted()));
</del><ins>+ return adoptRef(new HTMLScriptElement(tagQName(), targetDocument, false, alreadyStarted()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLScriptElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLScriptElement.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLScriptElement.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/html/HTMLScriptElement.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void dispatchLoadEvent() override;
</span><span class="cx">
</span><del>- virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren() override;
</del><ins>+ virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren(Document&) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } //namespace
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTemplateElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTemplateElement.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTemplateElement.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/html/HTMLTemplateElement.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -68,17 +68,17 @@
</span><span class="cx"> return m_content.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Node> HTMLTemplateElement::cloneNodeInternal(CloningOperation type)
</del><ins>+RefPtr<Node> HTMLTemplateElement::cloneNodeInternal(Document& targetDocument, CloningOperation type)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Node> clone;
</span><span class="cx"> switch (type) {
</span><span class="cx"> case CloningOperation::OnlySelf:
</span><del>- return cloneElementWithoutChildren();
</del><ins>+ return cloneElementWithoutChildren(targetDocument);
</ins><span class="cx"> case CloningOperation::SelfWithTemplateContent:
</span><del>- clone = cloneElementWithoutChildren();
</del><ins>+ clone = cloneElementWithoutChildren(targetDocument);
</ins><span class="cx"> break;
</span><span class="cx"> case CloningOperation::Everything:
</span><del>- clone = cloneElementWithChildren();
</del><ins>+ clone = cloneElementWithChildren(targetDocument);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (m_content)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTemplateElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTemplateElement.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTemplateElement.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/html/HTMLTemplateElement.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> private:
</span><span class="cx"> HTMLTemplateElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><del>- virtual RefPtr<Node> cloneNodeInternal(CloningOperation) override;
</del><ins>+ virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</ins><span class="cx"> virtual void didMoveToNewDocument(Document* oldDocument) override;
</span><span class="cx">
</span><span class="cx"> mutable RefPtr<TemplateContentDocumentFragment> m_content;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSliderThumbElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -598,9 +598,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Element> SliderThumbElement::cloneElementWithoutAttributesAndChildren()
</del><ins>+RefPtr<Element> SliderThumbElement::cloneElementWithoutAttributesAndChildren(Document& targetDocument)
</ins><span class="cx"> {
</span><del>- return create(document());
</del><ins>+ return create(targetDocument);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // --------------------------------
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSliderThumbElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SliderThumbElement.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> SliderThumbElement(Document&);
</span><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&) override;
</span><del>- virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren() override;
</del><ins>+ virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren(Document&) override;
</ins><span class="cx"> virtual bool isDisabledFormControl() const override;
</span><span class="cx"> virtual bool matchesReadWritePseudoClass() const override;
</span><span class="cx"> virtual Element* focusDelegate() override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackWebVTTElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/WebVTTElement.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/WebVTTElement.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/html/track/WebVTTElement.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -80,9 +80,9 @@
</span><span class="cx"> return adoptRef(new WebVTTElement(nodeType, document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Element> WebVTTElement::cloneElementWithoutAttributesAndChildren()
</del><ins>+RefPtr<Element> WebVTTElement::cloneElementWithoutAttributesAndChildren(Document& targetDocument)
</ins><span class="cx"> {
</span><del>- RefPtr<WebVTTElement> clone = create(static_cast<WebVTTNodeType>(m_webVTTNodeType), document());
</del><ins>+ RefPtr<WebVTTElement> clone = create(static_cast<WebVTTNodeType>(m_webVTTNodeType), targetDocument);
</ins><span class="cx"> clone->setLanguage(m_language);
</span><span class="cx"> return clone;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackWebVTTElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/WebVTTElement.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/WebVTTElement.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/html/track/WebVTTElement.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> static PassRefPtr<WebVTTElement> create(const WebVTTNodeType, Document&);
</span><span class="cx"> PassRefPtr<HTMLElement> createEquivalentHTMLElement(Document&);
</span><span class="cx">
</span><del>- virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren() override;
</del><ins>+ virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren(Document&) override;
</ins><span class="cx">
</span><span class="cx"> void setWebVTTNodeType(WebVTTNodeType type) { m_webVTTNodeType = static_cast<unsigned>(type); }
</span><span class="cx"> WebVTTNodeType webVTTNodeType() const { return static_cast<WebVTTNodeType>(m_webVTTNodeType); }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGScriptElement.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGScriptElement.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/svg/SVGScriptElement.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -192,9 +192,9 @@
</span><span class="cx"> return hasAttribute(XLinkNames::hrefAttr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Element> SVGScriptElement::cloneElementWithoutAttributesAndChildren()
</del><ins>+RefPtr<Element> SVGScriptElement::cloneElementWithoutAttributesAndChildren(Document& targetDocument)
</ins><span class="cx"> {
</span><del>- return adoptRef(new SVGScriptElement(tagQName(), document(), false, alreadyStarted()));
</del><ins>+ return adoptRef(new SVGScriptElement(tagQName(), targetDocument, false, alreadyStarted()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGScriptElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGScriptElement.h (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGScriptElement.h 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/svg/SVGScriptElement.h 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void dispatchLoadEvent() override { SVGExternalResourcesRequired::dispatchLoadEvent(this); }
</span><span class="cx">
</span><del>- virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren() override;
</del><ins>+ virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren(Document&) override;
</ins><span class="cx"> virtual bool rendererIsNeeded(const RenderStyle&) override { return false; }
</span><span class="cx">
</span><span class="cx"> // SVGExternalResourcesRequired
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (177371 => 177372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2014-12-16 19:07:50 UTC (rev 177371)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2014-12-16 19:08:54 UTC (rev 177372)
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx"> if (isDisallowedElement(*target))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<SVGElement> newChild = static_pointer_cast<SVGElement>(targetInstance->correspondingElement()->cloneElementWithChildren());
</del><ins>+ RefPtr<SVGElement> newChild = static_pointer_cast<SVGElement>(targetInstance->correspondingElement()->cloneElementWithChildren(document()));
</ins><span class="cx">
</span><span class="cx"> // We don't walk the target tree element-by-element, and clone each element,
</span><span class="cx"> // but instead use cloneElementWithChildren(). This is an optimization for the common
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx"> transferUseAttributesToReplacedElement(&use, cloneParent.get());
</span><span class="cx">
</span><span class="cx"> if (target && !isDisallowedElement(*target)) {
</span><del>- RefPtr<Element> newChild = target->cloneElementWithChildren();
</del><ins>+ RefPtr<Element> newChild = target->cloneElementWithChildren(document());
</ins><span class="cx"> ASSERT(newChild->isSVGElement());
</span><span class="cx"> cloneParent->appendChild(newChild.release());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>