<!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>[190497] branches/safari-601-branch</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/190497">190497</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-02 06:57:22 -0700 (Fri, 02 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188768">r188768</a>. rdar://problem/22802019</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorDOMPatchSupportcpp">branches/safari-601-branch/Source/WebCore/inspector/DOMPatchSupport.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsinspectordomgetOuterHTMLexpectedtxt">branches/safari-601-branch/LayoutTests/inspector/dom/getOuterHTML-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectordomgetOuterHTMLhtml">branches/safari-601-branch/LayoutTests/inspector/dom/getOuterHTML.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectordomsetOuterHTMLexpectedtxt">branches/safari-601-branch/LayoutTests/inspector/dom/setOuterHTML-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectordomsetOuterHTMLhtml">branches/safari-601-branch/LayoutTests/inspector/dom/setOuterHTML.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (190496 => 190497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-02 13:57:10 UTC (rev 190496)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-02 13:57:22 UTC (rev 190497)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188768. rdar://problem/22802019
+
+ 2015-08-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: REGRESSION(173684): Edit as HTML not working
+ https://bugs.webkit.org/show_bug.cgi?id=148268
+
+ Reviewed by Chris Dumez.
+
+ * inspector/dom/getOuterHTML-expected.txt: Added.
+ * inspector/dom/getOuterHTML.html: Added.
+ * inspector/dom/setOuterHTML-expected.txt: Added.
+ * inspector/dom/setOuterHTML.html: Added.
+
+2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r188755. rdar://problem/22802005
</span><span class="cx">
</span><span class="cx"> 2015-08-21 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordomgetOuterHTMLexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/dom/getOuterHTML-expected.txt (0 => 190497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/dom/getOuterHTML-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/dom/getOuterHTML-expected.txt 2015-10-02 13:57:22 UTC (rev 190497)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Test for DOM.getOuterHTML (Copy HTML).
+
+
+== Running test suite: DOM.getOuterHTML
+-- Running test case: GetOuterHTML
+Dumping outerHTML for element div#x:
+<div id="x" style="display:none">
+ <h1>A Title</h1>
+ <p>A Paragraph</p>
+</div>
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordomgetOuterHTMLhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/dom/getOuterHTML.html (0 => 190497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/dom/getOuterHTML.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/dom/getOuterHTML.html 2015-10-02 13:57:22 UTC (rev 190497)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("DOM.getOuterHTML");
+
+ suite.addTestCase({
+ name: "GetOuterHTML",
+ description: "Get the OuterHTML of the target element.",
+ test: (resolve, reject) => {
+ WebInspector.domTreeManager.requestDocument(function(documentNode) {
+ WebInspector.domTreeManager.querySelector(documentNode.id, "#x", function(nodeId) {
+ let domNode = WebInspector.domTreeManager.nodeForId(nodeId);
+ InspectorTest.assert(domNode, "DOMNode exists");
+ domNode.getOuterHTML(function(error, outerHTML) {
+ InspectorTest.expectNoError(error);
+ InspectorTest.log("Dumping outerHTML for element div#x:");
+ InspectorTest.log(outerHTML);
+ resolve();
+ });
+ });
+ });
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Test for DOM.getOuterHTML (Copy HTML).</p>
+
+<div id="x" style="display:none">
+ <h1>A Title</h1>
+ <p>A Paragraph</p>
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordomsetOuterHTMLexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/dom/setOuterHTML-expected.txt (0 => 190497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/dom/setOuterHTML-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/dom/setOuterHTML-expected.txt 2015-10-02 13:57:22 UTC (rev 190497)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Test for DOM.setOuterHTML (Edit as HTML).
+
+
+== Running test suite: DOM.setOuterHTML
+-- Running test case: OuterHTMLBefore
+<div id="x" style="display:none">
+ <h1>Original Title</h1>
+ <p>Original Paragraph</p>
+</div>
+
+-- Running test case: SetOuterHTMLRemovingElements
+-- Running test case: CheckOuterHTMLAfterRemovingElements
+PASS: The outerHTML should be what was just set.
+<div id="x"></div>
+
+-- Running test case: SetOuterHTMLAddingElements
+-- Running test case: CheckOuterHTMLAfterAddingElements
+PASS: The outerHTML should be what was just set.
+<div id="x" style="display:none; color:red">
+ <div class="container">
+ <h1>A Title</h1>
+ <p>A Paragraph</p>
+ </div>
+</div>
+
+-- Running test case: SetOuterHTMLModifyingElements
+-- Running test case: CheckOuterHTMLAfterModifyingElements
+PASS: The outerHTML should be what was just set.
+<div id="x" style="display:none; color:red">
+ <div class="container">
+ <h1>A Different Title</h1>
+ <p>A Paragraph</p>
+ </div>
+</div>
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordomsetOuterHTMLhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/dom/setOuterHTML.html (0 => 190497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/dom/setOuterHTML.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/dom/setOuterHTML.html 2015-10-02 13:57:22 UTC (rev 190497)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let domNode;
+ let suite = InspectorTest.createAsyncSuite("DOM.setOuterHTML");
+
+ suite.addTestCase({
+ name: "OuterHTMLBefore",
+ description: "Log the initial outerHTML of the target element.",
+ test: (resolve, reject) => {
+ domNode.getOuterHTML(function(error, outerHTML) {
+ InspectorTest.expectNoError(error);
+ InspectorTest.log(outerHTML);
+ resolve();
+ });
+ }
+ });
+
+ const emptyOuterHTML = `<div id="x"></div>`;
+
+ const newOuterHTML = `
+<div id="x" style="display:none; color:red">
+ <div class="container">
+ <h1>A Title</h1>
+ <p>A Paragraph</p>
+ </div>
+</div>`.trim();
+
+ const modifiedOuterHTML = `
+<div id="x" style="display:none; color:red">
+ <div class="container">
+ <h1>A Different Title</h1>
+ <p>A Paragraph</p>
+ </div>
+</div>`.trim();
+
+ let steps = [
+ ["RemovingElements", emptyOuterHTML],
+ ["AddingElements", newOuterHTML],
+ ["ModifyingElements", modifiedOuterHTML],
+ ];
+
+ steps.forEach(function(tuple) {
+ let [title, replacementOuterHTML] = tuple;
+ suite.addTestCase({
+ name: `SetOuterHTML${title}`,
+ description: "Change the outerHTML.",
+ test: (resolve, reject) => {
+ domNode.setOuterHTML(replacementOuterHTML, function(error, outerHTML) {
+ InspectorTest.expectNoError(error);
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: `CheckOuterHTMLAfter${title}`,
+ description: "Log the outerHTML of the target element after changes.",
+ test: (resolve, reject) => {
+ domNode.getOuterHTML(function(error, outerHTML) {
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(outerHTML === replacementOuterHTML, "The outerHTML should be what was just set.");
+ InspectorTest.log(outerHTML);
+ resolve();
+ });
+ }
+ });
+ });
+
+ WebInspector.domTreeManager.requestDocument(function(documentNode) {
+ WebInspector.domTreeManager.querySelector(documentNode.id, "#x", function(nodeId) {
+ domNode = WebInspector.domTreeManager.nodeForId(nodeId);
+ InspectorTest.assert(domNode, "DOMNode exists.");
+ suite.runTestCasesAndFinish();
+ });
+ });
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Test for DOM.setOuterHTML (Edit as HTML).</p>
+
+<div id="x" style="display:none">
+ <h1>Original Title</h1>
+ <p>Original Paragraph</p>
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (190496 => 190497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-02 13:57:10 UTC (rev 190496)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-02 13:57:22 UTC (rev 190497)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188768. rdar://problem/22802019
+
+ 2015-08-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: REGRESSION(173684): Edit as HTML not working
+ https://bugs.webkit.org/show_bug.cgi?id=148268
+
+ Reviewed by Chris Dumez.
+
+ Tests: inspector/dom/getOuterHTML.html
+ inspector/dom/setOuterHTML.html
+
+ * inspector/DOMPatchSupport.cpp:
+ (WebCore::DOMPatchSupport::innerPatchChildren):
+ Revert the optimization change made in r173684. The optimization changes
+ had a few issues. It changed the logic to potentially drop out of the
+ loop before all new items were processed and using a node reference
+ to track an index did not account for the modifications insertBefore
+ may have made to that node's index in the list.
+
+2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r188690. rdar://problem/22802006
</span><span class="cx">
</span><span class="cx"> 2015-08-20 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorDOMPatchSupportcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/DOMPatchSupport.cpp (190496 => 190497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/DOMPatchSupport.cpp 2015-10-02 13:57:10 UTC (rev 190496)
+++ branches/safari-601-branch/Source/WebCore/inspector/DOMPatchSupport.cpp 2015-10-02 13:57:22 UTC (rev 190497)
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Mark retained nodes as used, do not reuse node more than once.
</span><del>- HashSet<size_t, WTF::IntHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t>> usedOldOrdinals;
</del><ins>+ HashSet<size_t, WTF::IntHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t>> usedOldOrdinals;
</ins><span class="cx"> for (size_t i = 0; i < newList.size(); ++i) {
</span><span class="cx"> if (!newMap[i].first)
</span><span class="cx"> continue;
</span><span class="lines">@@ -374,11 +374,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 3. Insert missing nodes.
</span><del>- Node* node = parentNode->firstChild();
- for (unsigned i = 0; node && i < newMap.size(); ++i, node = node->nextSibling()) {
</del><ins>+ for (size_t i = 0; i < newMap.size(); ++i) {
</ins><span class="cx"> if (newMap[i].first || merges.contains(newList[i].get()))
</span><span class="cx"> continue;
</span><del>- if (!insertBeforeAndMarkAsUsed(parentNode, newList[i].get(), node, ec))
</del><ins>+ if (!insertBeforeAndMarkAsUsed(parentNode, newList[i].get(), parentNode->traverseToChildAt(i), ec))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>