<!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>[161572] 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/161572">161572</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-09 12:22:06 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DocumentOrderedMap should use iterator
https://bugs.webkit.org/show_bug.cgi?id=126696
Reviewed by Andreas Kling.
* dom/DocumentOrderedMap.cpp:
(WebCore::keyMatchesId):
(WebCore::keyMatchesName):
(WebCore::keyMatchesMapName):
(WebCore::keyMatchesLowercasedMapName):
(WebCore::keyMatchesLowercasedUsemap):
(WebCore::keyMatchesLabelForAttribute):
(WebCore::keyMatchesWindowNamedItem):
(WebCore::keyMatchesDocumentNamedItem):
Switch to Element references.
(WebCore::DocumentOrderedMap::add):
(WebCore::DocumentOrderedMap::remove):
(WebCore::DocumentOrderedMap::get):
(WebCore::DocumentOrderedMap::getAllElementsById):
Use element iterator instead of ElementTraversal.
* dom/DocumentOrderedMap.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentOrderedMapcpp">trunk/Source/WebCore/dom/DocumentOrderedMap.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentOrderedMaph">trunk/Source/WebCore/dom/DocumentOrderedMap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161571 => 161572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-09 20:20:28 UTC (rev 161571)
+++ trunk/Source/WebCore/ChangeLog 2014-01-09 20:22:06 UTC (rev 161572)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-01-09 Antti Koivisto <antti@apple.com>
+
+ DocumentOrderedMap should use iterator
+ https://bugs.webkit.org/show_bug.cgi?id=126696
+
+ Reviewed by Andreas Kling.
+
+ * dom/DocumentOrderedMap.cpp:
+ (WebCore::keyMatchesId):
+ (WebCore::keyMatchesName):
+ (WebCore::keyMatchesMapName):
+ (WebCore::keyMatchesLowercasedMapName):
+ (WebCore::keyMatchesLowercasedUsemap):
+ (WebCore::keyMatchesLabelForAttribute):
+ (WebCore::keyMatchesWindowNamedItem):
+ (WebCore::keyMatchesDocumentNamedItem):
+
+ Switch to Element references.
+
+ (WebCore::DocumentOrderedMap::add):
+ (WebCore::DocumentOrderedMap::remove):
+ (WebCore::DocumentOrderedMap::get):
+ (WebCore::DocumentOrderedMap::getAllElementsById):
+
+ Use element iterator instead of ElementTraversal.
+
+ * dom/DocumentOrderedMap.h:
+
</ins><span class="cx"> 2014-01-09 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Margin tiles are not repainted when background color changes
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentOrderedMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentOrderedMap.cpp (161571 => 161572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentOrderedMap.cpp 2014-01-09 20:20:28 UTC (rev 161571)
+++ trunk/Source/WebCore/dom/DocumentOrderedMap.cpp 2014-01-09 20:22:06 UTC (rev 161572)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DocumentOrderedMap.h"
</span><span class="cx">
</span><del>-#include "ElementTraversal.h"
</del><ins>+#include "ElementIterator.h"
</ins><span class="cx"> #include "HTMLImageElement.h"
</span><span class="cx"> #include "HTMLLabelElement.h"
</span><span class="cx"> #include "HTMLMapElement.h"
</span><span class="lines">@@ -41,45 +41,45 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-inline bool keyMatchesId(const AtomicStringImpl& key, Element* element)
</del><ins>+inline bool keyMatchesId(const AtomicStringImpl& key, const Element& element)
</ins><span class="cx"> {
</span><del>- return element->getIdAttribute().impl() == &key;
</del><ins>+ return element.getIdAttribute().impl() == &key;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool keyMatchesName(const AtomicStringImpl& key, Element* element)
</del><ins>+inline bool keyMatchesName(const AtomicStringImpl& key, const Element& element)
</ins><span class="cx"> {
</span><del>- return element->getNameAttribute().impl() == &key;
</del><ins>+ return element.getNameAttribute().impl() == &key;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool keyMatchesMapName(const AtomicStringImpl& key, Element* element)
</del><ins>+inline bool keyMatchesMapName(const AtomicStringImpl& key, const Element& element)
</ins><span class="cx"> {
</span><del>- return isHTMLMapElement(element) && toHTMLMapElement(element)->getName().impl() == &key;
</del><ins>+ return isHTMLMapElement(element) && toHTMLMapElement(element).getName().impl() == &key;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool keyMatchesLowercasedMapName(const AtomicStringImpl& key, Element* element)
</del><ins>+inline bool keyMatchesLowercasedMapName(const AtomicStringImpl& key, const Element& element)
</ins><span class="cx"> {
</span><del>- return isHTMLMapElement(element) && toHTMLMapElement(element)->getName().lower().impl() == &key;
</del><ins>+ return isHTMLMapElement(element) && toHTMLMapElement(element).getName().lower().impl() == &key;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool keyMatchesLowercasedUsemap(const AtomicStringImpl& key, Element* element)
</del><ins>+inline bool keyMatchesLowercasedUsemap(const AtomicStringImpl& key, const Element& element)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: HTML5 specification says we should match both image and object elements.
</span><del>- return isHTMLImageElement(element) && toHTMLImageElement(element)->matchesLowercasedUsemap(key);
</del><ins>+ return isHTMLImageElement(element) && toHTMLImageElement(element).matchesLowercasedUsemap(key);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool keyMatchesLabelForAttribute(const AtomicStringImpl& key, Element* element)
</del><ins>+inline bool keyMatchesLabelForAttribute(const AtomicStringImpl& key, const Element& element)
</ins><span class="cx"> {
</span><del>- return isHTMLLabelElement(element) && element->getAttribute(forAttr).impl() == &key;
</del><ins>+ return isHTMLLabelElement(element) && element.getAttribute(forAttr).impl() == &key;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool keyMatchesWindowNamedItem(const AtomicStringImpl& key, Element* element)
</del><ins>+inline bool keyMatchesWindowNamedItem(const AtomicStringImpl& key, const Element& element)
</ins><span class="cx"> {
</span><del>- return WindowNameCollection::nodeMatches(element, &key);
</del><ins>+ return WindowNameCollection::nodeMatches(const_cast<Element*>(&element), &key);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool keyMatchesDocumentNamedItem(const AtomicStringImpl& key, Element* element)
</del><ins>+inline bool keyMatchesDocumentNamedItem(const AtomicStringImpl& key, const Element& element)
</ins><span class="cx"> {
</span><del>- return DocumentNameCollection::nodeMatches(element, &key);
</del><ins>+ return DocumentNameCollection::nodeMatches(const_cast<Element*>(&element), &key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentOrderedMap::clear()
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> MapEntry& entry = addResult.iterator->value;
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(entry.count);
</span><del>- entry.element = 0;
</del><ins>+ entry.element = nullptr;
</ins><span class="cx"> entry.count++;
</span><span class="cx"> entry.orderedList.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -119,20 +119,20 @@
</span><span class="cx"> m_map.remove(it);
</span><span class="cx"> } else {
</span><span class="cx"> if (entry.element == &element)
</span><del>- entry.element = 0;
</del><ins>+ entry.element = nullptr;
</ins><span class="cx"> entry.count--;
</span><span class="cx"> entry.orderedList.clear(); // FIXME: Remove the element instead if there are only few items left.
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<bool keyMatches(const AtomicStringImpl&, Element*)>
</del><ins>+template<bool keyMatches(const AtomicStringImpl&, const Element&)>
</ins><span class="cx"> inline Element* DocumentOrderedMap::get(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="cx"> {
</span><span class="cx"> m_map.checkConsistency();
</span><span class="cx">
</span><span class="cx"> auto it = m_map.find(&key);
</span><span class="cx"> if (it == m_map.end())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> MapEntry& entry = it->value;
</span><span class="cx"> ASSERT(entry.count);
</span><span class="lines">@@ -143,16 +143,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We know there's at least one node that matches; iterate to find the first one.
</span><del>- for (Element* element = ElementTraversal::firstWithin(scope.rootNode()); element; element = ElementTraversal::next(element)) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(*scope.rootNode())) {
</ins><span class="cx"> if (!keyMatches(key, element))
</span><span class="cx"> continue;
</span><del>- entry.element = element;
- ASSERT_WITH_SECURITY_IMPLICATION(element->isInTreeScope());
- ASSERT_WITH_SECURITY_IMPLICATION(&element->treeScope() == &scope);
- return element;
</del><ins>+ entry.element = &element;
+ ASSERT_WITH_SECURITY_IMPLICATION(element.isInTreeScope());
+ ASSERT_WITH_SECURITY_IMPLICATION(&element.treeScope() == &scope);
+ return &element;
</ins><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Element* DocumentOrderedMap::getElementById(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="lines">@@ -201,19 +201,23 @@
</span><span class="cx">
</span><span class="cx"> auto it = m_map.find(&key);
</span><span class="cx"> if (it == m_map.end())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> MapEntry& entry = it->value;
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(entry.count);
</span><span class="cx"> if (!entry.count)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (entry.orderedList.isEmpty()) {
</span><span class="cx"> entry.orderedList.reserveCapacity(entry.count);
</span><del>- for (Element* element = entry.element ? entry.element : ElementTraversal::firstWithin(scope.rootNode()); element; element = ElementTraversal::next(element)) {
</del><ins>+ auto elementDescandents = descendantsOfType<Element>(*scope.rootNode());
+ auto it = entry.element ? elementDescandents.find(*entry.element) : elementDescandents.begin();
+ auto end = elementDescandents.end();
+ for (; it != end; ++it) {
+ auto& element = *it;
</ins><span class="cx"> if (!keyMatchesId(key, element))
</span><span class="cx"> continue;
</span><del>- entry.orderedList.append(element);
</del><ins>+ entry.orderedList.append(&element);
</ins><span class="cx"> }
</span><span class="cx"> ASSERT(entry.orderedList.size() == entry.count);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentOrderedMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentOrderedMap.h (161571 => 161572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentOrderedMap.h 2014-01-09 20:20:28 UTC (rev 161571)
+++ trunk/Source/WebCore/dom/DocumentOrderedMap.h 2014-01-09 20:22:06 UTC (rev 161572)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> const Vector<Element*>* getAllElementsById(const AtomicStringImpl&, const TreeScope&) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- template<bool keyMatches(const AtomicStringImpl&, Element*)> Element* get(const AtomicStringImpl&, const TreeScope&) const;
</del><ins>+ template<bool keyMatches(const AtomicStringImpl&, const Element&)> Element* get(const AtomicStringImpl&, const TreeScope&) const;
</ins><span class="cx">
</span><span class="cx"> struct MapEntry {
</span><span class="cx"> MapEntry()
</span></span></pre>
</div>
</div>
</body>
</html>