<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[24831] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24831">24831</a></dd>
<dt>Author</dt> <dd>hyatt</dd>
<dt>Date</dt> <dd>2007-08-02 15:50:26 -0700 (Thu, 02 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Fix for 5374437, allow comment nodes to be the child of a document.
Refine the check to always make a root element to check documentElement()
rather than firstChild(), since a comment node could be present as the
firstChild() now.
Reviewed by Tim Hatcher
* html/HTMLDocument.cpp:
(WebCore::HTMLDocument::childAllowed):
* html/HTMLParser.cpp:
(WebCore::HTMLParser::finished):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorehtmlHTMLDocumentcpp">trunk/WebCore/html/HTMLDocument.cpp</a></li>
<li><a href="#trunkWebCorehtmlHTMLParsercpp">trunk/WebCore/html/HTMLParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (24830 => 24831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-08-02 22:39:52 UTC (rev 24830)
+++ trunk/WebCore/ChangeLog 2007-08-02 22:50:26 UTC (rev 24831)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2007-08-02 David Hyatt <hyatt@apple.com>
+
+ Fix for 5374437, allow comment nodes to be the child of a document.
+ Refine the check to always make a root element to check documentElement()
+ rather than firstChild(), since a comment node could be present as the
+ firstChild() now.
+
+ Reviewed by Tim Hatcher
+
+ * html/HTMLDocument.cpp:
+ (WebCore::HTMLDocument::childAllowed):
+ * html/HTMLParser.cpp:
+ (WebCore::HTMLParser::finished):
+
</ins><span class="cx"> 2007-08-02 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin.
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLDocument.cpp (24830 => 24831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLDocument.cpp 2007-08-02 22:39:52 UTC (rev 24830)
+++ trunk/WebCore/html/HTMLDocument.cpp 2007-08-02 22:50:26 UTC (rev 24831)
</span><span class="lines">@@ -295,9 +295,9 @@
</span><span class="cx"> // not part of the DOM
</span><span class="cx"> // --------------------------------------------------------------------------
</span><span class="cx">
</span><del>-bool HTMLDocument::childAllowed( Node *newChild )
</del><ins>+bool HTMLDocument::childAllowed(Node *newChild)
</ins><span class="cx"> {
</span><del>- return newChild->hasTagName(htmlTag);
</del><ins>+ return newChild->hasTagName(htmlTag) || newChild->isCommentNode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void addItemToMap(HTMLDocument::NameCountMap& map, const String& name)
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLParser.cpp (24830 => 24831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLParser.cpp 2007-08-02 22:39:52 UTC (rev 24830)
+++ trunk/WebCore/html/HTMLParser.cpp 2007-08-02 22:50:26 UTC (rev 24831)
</span><span class="lines">@@ -1406,7 +1406,7 @@
</span><span class="cx"> void HTMLParser::finished()
</span><span class="cx"> {
</span><span class="cx"> // In the case of a completely empty document, here's the place to create the HTML element.
</span><del>- if (current && current->isDocumentNode() && !current->firstChild())
</del><ins>+ if (current && current->isDocumentNode() && !document->documentElement())
</ins><span class="cx"> insertNode(new HTMLHtmlElement(document));
</span><span class="cx">
</span><span class="cx"> // This ensures that "current" is not left pointing to a node when the document is destroyed.
</span></span></pre>
</div>
</div>
</body>
</html>