<!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>[158537] trunk/Source/WebCore</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/158537">158537</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2013-11-03 12:19:52 -0800 (Sun, 03 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Switch createContextualFragment to element iterator
https://bugs.webkit.org/show_bug.cgi?id=123704

Reviewed by Andreas Kling.

* editing/FrameSelection.cpp:
(WebCore::scanForForm):
        
    Use type helpers instead of hasTagName

* editing/markup.cpp:
(WebCore::collectElementsToRemoveFromFragment):
(WebCore::removeElementFromFragmentPreservingChildren):
(WebCore::createContextualFragment):
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::formElementIndex):
        
    Use type helpers instead of hasTagName

* html/HTMLTagNames.in:
        
    Generate type helpers for &lt;html&gt;.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingmarkupcpp">trunk/Source/WebCore/editing/markup.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTagNamesin">trunk/Source/WebCore/html/HTMLTagNames.in</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (158536 => 158537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-03 19:52:40 UTC (rev 158536)
+++ trunk/Source/WebCore/ChangeLog        2013-11-03 20:19:52 UTC (rev 158537)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2013-11-03  Antti Koivisto  &lt;antti@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Switch createContextualFragment to element iterator
+        https://bugs.webkit.org/show_bug.cgi?id=123704
+
+        Reviewed by Andreas Kling.
+
+        * editing/FrameSelection.cpp:
+        (WebCore::scanForForm):
+        
+            Use type helpers instead of hasTagName
+
+        * editing/markup.cpp:
+        (WebCore::collectElementsToRemoveFromFragment):
+        (WebCore::removeElementFromFragmentPreservingChildren):
+        (WebCore::createContextualFragment):
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::formElementIndex):
+        
+            Use type helpers instead of hasTagName
+
+        * html/HTMLTagNames.in:
+        
+            Generate type helpers for &lt;html&gt;.
+
+2013-11-03  Antti Koivisto  &lt;antti@apple.com&gt;
+
</ins><span class="cx">         ChildNodeList should not be LiveNodeList
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=123708
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (158536 => 158537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp        2013-11-03 19:52:40 UTC (rev 158536)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp        2013-11-03 20:19:52 UTC (rev 158537)
</span><span class="lines">@@ -1959,10 +1959,13 @@
</span><span class="cx">         HTMLElement&amp; element = *it;
</span><span class="cx">         if (isHTMLFormElement(&amp;element))
</span><span class="cx">             return toHTMLFormElement(&amp;element);
</span><del>-        if (element.isFormControlElement())
-            return static_cast&lt;HTMLFormControlElement&amp;&gt;(element).form();
-        if (element.hasTagName(frameTag) || element.hasTagName(iframeTag)) {
-            if (HTMLFormElement* frameResult = scanForForm(toHTMLFrameElementBase(element).contentDocument()-&gt;documentElement()))
</del><ins>+        if (isHTMLFormControlElement(element))
+            return toHTMLFormControlElement(element).form();
+        if (isHTMLFrameElementBase(element)) {
+            Document* contentDocument = toHTMLFrameElementBase(element).contentDocument();
+            if (!contentDocument)
+                continue;
+            if (HTMLFormElement* frameResult = scanForForm(contentDocument-&gt;documentElement()))
</ins><span class="cx">                 return frameResult;
</span><span class="cx">         }
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/markup.cpp (158536 => 158537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/markup.cpp        2013-11-03 19:52:40 UTC (rev 158536)
+++ trunk/Source/WebCore/editing/markup.cpp        2013-11-03 20:19:52 UTC (rev 158537)
</span><span class="lines">@@ -902,15 +902,32 @@
</span><span class="cx">     return fragment.release();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static inline void removeElementPreservingChildren(PassRefPtr&lt;DocumentFragment&gt; fragment, HTMLElement* element)
</del><ins>+static Vector&lt;Ref&lt;HTMLElement&gt;&gt; collectElementsToRemoveFromFragment(ContainerNode&amp; container)
</ins><span class="cx"> {
</span><ins>+    Vector&lt;Ref&lt;HTMLElement&gt;&gt; toRemove;
+    auto children = childrenOfType&lt;HTMLElement&gt;(container);
+    for (auto it = children.begin(), end = children.end(); it != end; ++it) {
+        HTMLElement&amp; element = *it;
+        if (isHTMLHtmlElement(element)) {
+            toRemove.append(element);
+            collectElementsToRemoveFromFragment(element);
+            continue;
+        }
+        if (isHTMLHeadElement(element) || isHTMLBodyElement(element))
+            toRemove.append(element);
+    }
+    return toRemove;
+}
+
+static void removeElementFromFragmentPreservingChildren(DocumentFragment&amp; fragment, HTMLElement&amp; element)
+{
</ins><span class="cx">     RefPtr&lt;Node&gt; nextChild;
</span><del>-    for (RefPtr&lt;Node&gt; child = element-&gt;firstChild(); child; child = nextChild) {
</del><ins>+    for (RefPtr&lt;Node&gt; child = element.firstChild(); child; child = nextChild) {
</ins><span class="cx">         nextChild = child-&gt;nextSibling();
</span><del>-        element-&gt;removeChild(child.get(), ASSERT_NO_EXCEPTION);
-        fragment-&gt;insertBefore(child, element, ASSERT_NO_EXCEPTION);
</del><ins>+        element.removeChild(child.get(), ASSERT_NO_EXCEPTION);
+        fragment.insertBefore(child, &amp;element, ASSERT_NO_EXCEPTION);
</ins><span class="cx">     }
</span><del>-    fragment-&gt;removeChild(element, ASSERT_NO_EXCEPTION);
</del><ins>+    fragment.removeChild(&amp;element, ASSERT_NO_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> PassRefPtr&lt;DocumentFragment&gt; createContextualFragment(const String&amp; markup, HTMLElement* element, ParserContentPolicy parserContentPolicy, ExceptionCode&amp; ec)
</span><span class="lines">@@ -934,16 +951,10 @@
</span><span class="cx">     // We need to pop &lt;html&gt; and &lt;body&gt; elements and remove &lt;head&gt; to
</span><span class="cx">     // accommodate folks passing complete HTML documents to make the
</span><span class="cx">     // child of an element.
</span><ins>+    auto toRemove = collectElementsToRemoveFromFragment(*fragment);
+    for (unsigned i = 0; i &lt; toRemove.size(); ++i)
+        removeElementFromFragmentPreservingChildren(*fragment, toRemove[i].get());
</ins><span class="cx"> 
</span><del>-    RefPtr&lt;HTMLElement&gt; nextElement;
-    for (RefPtr&lt;HTMLElement&gt; element = Traversal&lt;HTMLElement&gt;::firstWithin(fragment.get()); element; element = nextElement) {
-        nextElement = Traversal&lt;HTMLElement&gt;::nextSibling(element.get());
-        if (element-&gt;hasTagName(htmlTag) || element-&gt;hasTagName(headTag) || element-&gt;hasTagName(bodyTag)) {
-            if (HTMLElement* firstChild = Traversal&lt;HTMLElement&gt;::firstChild(element.get()))
-                nextElement = firstChild;
-            removeElementPreservingChildren(fragment, element.get());
-        }
-    }
</del><span class="cx">     return fragment.release();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (158536 => 158537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp        2013-11-03 19:52:40 UTC (rev 158536)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp        2013-11-03 20:19:52 UTC (rev 158537)
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx">         HTMLElement&amp; element = *it;
</span><span class="cx">         if (&amp;element == &amp;associatedHTMLElement)
</span><span class="cx">             return i;
</span><del>-        if (!element.isFormControlElement() &amp;&amp; !element.hasTagName(objectTag))
</del><ins>+        if (!isHTMLFormControlElement(element) &amp;&amp; !isHTMLObjectElement(element))
</ins><span class="cx">             continue;
</span><span class="cx">         if (element.form() != this)
</span><span class="cx">             continue;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTagNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTagNames.in (158536 => 158537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTagNames.in        2013-11-03 19:52:40 UTC (rev 158536)
+++ trunk/Source/WebCore/html/HTMLTagNames.in        2013-11-03 20:19:52 UTC (rev 158537)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> header interfaceName=HTMLElement
</span><span class="cx"> hgroup interfaceName=HTMLElement
</span><span class="cx"> hr interfaceName=HTMLHRElement
</span><del>-html
</del><ins>+html generateTypeHelpers
</ins><span class="cx"> i interfaceName=HTMLElement
</span><span class="cx"> iframe interfaceName=HTMLIFrameElement, generateTypeHelpers
</span><span class="cx"> image interfaceName=HTMLElement
</span></span></pre>
</div>
</div>

</body>
</html>