<!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>[175788] 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/175788">175788</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-08 21:59:52 -0800 (Sat, 08 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Call faster HTMLElement::hasTagName() in HTMLCollection
https://bugs.webkit.org/show_bug.cgi?id=138529
Reviewed by Darin Adler.
Call faster HTMLElement::hasTagName() in HTMLCollection instead of
slower Node::hasTagName() by restructuring the code a bit to
distinguish collection that deal only with HTMLElements from others.
No new tests, no behavior change.
* html/HTMLCollection.cpp:
(WebCore::isMatchingHTMLElement):
(WebCore::isMatchingElement):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectioncpp">trunk/Source/WebCore/html/HTMLCollection.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175787 => 175788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-09 05:46:59 UTC (rev 175787)
+++ trunk/Source/WebCore/ChangeLog 2014-11-09 05:59:52 UTC (rev 175788)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-11-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Call faster HTMLElement::hasTagName() in HTMLCollection
+ https://bugs.webkit.org/show_bug.cgi?id=138529
+
+ Reviewed by Darin Adler.
+
+ Call faster HTMLElement::hasTagName() in HTMLCollection instead of
+ slower Node::hasTagName() by restructuring the code a bit to
+ distinguish collection that deal only with HTMLElements from others.
+
+ No new tests, no behavior change.
+
+ * html/HTMLCollection.cpp:
+ (WebCore::isMatchingHTMLElement):
+ (WebCore::isMatchingElement):
+
+2014-11-08 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Move isEmptyValue() logic from HTMLInputElement to TextFieldInputType
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138538
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.cpp (175787 => 175788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.cpp 2014-11-09 05:46:59 UTC (rev 175787)
+++ trunk/Source/WebCore/html/HTMLCollection.cpp 2014-11-09 05:59:52 UTC (rev 175788)
</span><span class="lines">@@ -169,13 +169,9 @@
</span><span class="cx"> return ownerNode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isMatchingElement(const HTMLCollection& htmlCollection, Element& element)
</del><ins>+inline bool isMatchingHTMLElement(const HTMLCollection& collection, HTMLElement& element)
</ins><span class="cx"> {
</span><del>- CollectionType type = htmlCollection.type();
- if (!element.isHTMLElement() && !(type == DocAll || type == NodeChildren || type == WindowNamedItems))
- return false;
-
- switch (type) {
</del><ins>+ switch (collection.type()) {
</ins><span class="cx"> case DocImages:
</span><span class="cx"> return element.hasTagName(imgTag);
</span><span class="cx"> case DocScripts:
</span><span class="lines">@@ -209,13 +205,11 @@
</span><span class="cx"> return (element.hasTagName(aTag) || element.hasTagName(areaTag)) && element.fastHasAttribute(hrefAttr);
</span><span class="cx"> case DocAnchors:
</span><span class="cx"> return element.hasTagName(aTag) && element.fastHasAttribute(nameAttr);
</span><ins>+ case DocumentNamedItems:
+ return static_cast<const DocumentNameCollection&>(collection).elementMatches(element);
</ins><span class="cx"> case DocAll:
</span><span class="cx"> case NodeChildren:
</span><del>- return true;
- case DocumentNamedItems:
- return static_cast<const DocumentNameCollection&>(htmlCollection).elementMatches(element);
</del><span class="cx"> case WindowNamedItems:
</span><del>- return static_cast<const WindowNameCollection&>(htmlCollection).elementMatches(element);
</del><span class="cx"> case FormControls:
</span><span class="cx"> case TableRows:
</span><span class="cx"> break;
</span><span class="lines">@@ -224,6 +218,21 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool isMatchingElement(const HTMLCollection& collection, Element& element)
+{
+ // Collection types that deal with any type of Elements, not just HTMLElements.
+ switch (collection.type()) {
+ case DocAll:
+ case NodeChildren:
+ return true;
+ case WindowNamedItems:
+ return static_cast<const WindowNameCollection&>(collection).elementMatches(element);
+ default:
+ // Collection types that only deal with HTMLElements.
+ return is<HTMLElement>(element) && isMatchingHTMLElement(collection, downcast<HTMLElement>(element));
+ }
+}
+
</ins><span class="cx"> static Element* previousElement(ContainerNode& base, Element* previous, bool onlyIncludeDirectChildren)
</span><span class="cx"> {
</span><span class="cx"> return onlyIncludeDirectChildren ? ElementTraversal::previousSibling(previous) : ElementTraversal::previous(previous, &base);
</span></span></pre>
</div>
</div>
</body>
</html>