<!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>[175697] 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/175697">175697</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-06 08:00:24 -0800 (Thu, 06 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use lambda functions in DocumentOrderedMap
https://bugs.webkit.org/show_bug.cgi?id=138376
Reviewed by Darin Adler.
Use lambda functions in DocumentOrderedMap instead of separate named
functions.
No new tests, no behavior change.
* dom/DocumentOrderedMap.cpp:
(WebCore::DocumentOrderedMap::get):
(WebCore::DocumentOrderedMap::getElementById):
(WebCore::DocumentOrderedMap::getElementByName):
(WebCore::DocumentOrderedMap::getElementByMapName):
(WebCore::DocumentOrderedMap::getElementByLowercasedMapName):
(WebCore::DocumentOrderedMap::getElementByLowercasedUsemap):
(WebCore::DocumentOrderedMap::getElementByLabelForAttribute):
(WebCore::DocumentOrderedMap::getElementByWindowNamedItem):
(WebCore::DocumentOrderedMap::getElementByDocumentNamedItem):
(WebCore::DocumentOrderedMap::getAllElementsById):
(WebCore::keyMatchesId): Deleted.
(WebCore::keyMatchesName): Deleted.
(WebCore::keyMatchesMapName): Deleted.
(WebCore::keyMatchesLowercasedMapName): Deleted.
(WebCore::keyMatchesLowercasedUsemap): Deleted.
(WebCore::keyMatchesLabelForAttribute): Deleted.
(WebCore::keyMatchesWindowNamedItem): Deleted.
(WebCore::keyMatchesDocumentNamedItem): Deleted.
* 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 (175696 => 175697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-06 15:46:34 UTC (rev 175696)
+++ trunk/Source/WebCore/ChangeLog 2014-11-06 16:00:24 UTC (rev 175697)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-11-06 Chris Dumez <cdumez@apple.com>
+
+ Use lambda functions in DocumentOrderedMap
+ https://bugs.webkit.org/show_bug.cgi?id=138376
+
+ Reviewed by Darin Adler.
+
+ Use lambda functions in DocumentOrderedMap instead of separate named
+ functions.
+
+ No new tests, no behavior change.
+
+ * dom/DocumentOrderedMap.cpp:
+ (WebCore::DocumentOrderedMap::get):
+ (WebCore::DocumentOrderedMap::getElementById):
+ (WebCore::DocumentOrderedMap::getElementByName):
+ (WebCore::DocumentOrderedMap::getElementByMapName):
+ (WebCore::DocumentOrderedMap::getElementByLowercasedMapName):
+ (WebCore::DocumentOrderedMap::getElementByLowercasedUsemap):
+ (WebCore::DocumentOrderedMap::getElementByLabelForAttribute):
+ (WebCore::DocumentOrderedMap::getElementByWindowNamedItem):
+ (WebCore::DocumentOrderedMap::getElementByDocumentNamedItem):
+ (WebCore::DocumentOrderedMap::getAllElementsById):
+ (WebCore::keyMatchesId): Deleted.
+ (WebCore::keyMatchesName): Deleted.
+ (WebCore::keyMatchesMapName): Deleted.
+ (WebCore::keyMatchesLowercasedMapName): Deleted.
+ (WebCore::keyMatchesLowercasedUsemap): Deleted.
+ (WebCore::keyMatchesLabelForAttribute): Deleted.
+ (WebCore::keyMatchesWindowNamedItem): Deleted.
+ (WebCore::keyMatchesDocumentNamedItem): Deleted.
+ * dom/DocumentOrderedMap.h:
+
</ins><span class="cx"> 2014-11-05 Shivakumar JM <shiva.jm@samsung.com>
</span><span class="cx">
</span><span class="cx"> splitText API does not match DOM specification.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentOrderedMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentOrderedMap.cpp (175696 => 175697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentOrderedMap.cpp 2014-11-06 15:46:34 UTC (rev 175696)
+++ trunk/Source/WebCore/dom/DocumentOrderedMap.cpp 2014-11-06 16:00:24 UTC (rev 175697)
</span><span class="lines">@@ -41,47 +41,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-inline bool keyMatchesId(const AtomicStringImpl& key, const Element& element)
-{
- return element.getIdAttribute().impl() == &key;
-}
-
-inline bool keyMatchesName(const AtomicStringImpl& key, const Element& element)
-{
- return element.getNameAttribute().impl() == &key;
-}
-
-inline bool keyMatchesMapName(const AtomicStringImpl& key, const Element& element)
-{
- return is<HTMLMapElement>(element) && downcast<HTMLMapElement>(element).getName().impl() == &key;
-}
-
-inline bool keyMatchesLowercasedMapName(const AtomicStringImpl& key, const Element& element)
-{
- return is<HTMLMapElement>(element) && downcast<HTMLMapElement>(element).getName().lower().impl() == &key;
-}
-
-inline bool keyMatchesLowercasedUsemap(const AtomicStringImpl& key, const Element& element)
-{
- // FIXME: HTML5 specification says we should match both image and object elements.
- return is<HTMLImageElement>(element) && downcast<HTMLImageElement>(element).matchesLowercasedUsemap(key);
-}
-
-inline bool keyMatchesLabelForAttribute(const AtomicStringImpl& key, const Element& element)
-{
- return is<HTMLLabelElement>(element) && element.fastGetAttribute(forAttr).impl() == &key;
-}
-
-inline bool keyMatchesWindowNamedItem(const AtomicStringImpl& key, const Element& element)
-{
- return WindowNameCollection::elementMatches(element, &key);
-}
-
-inline bool keyMatchesDocumentNamedItem(const AtomicStringImpl& key, const Element& element)
-{
- return DocumentNameCollection::elementMatches(element, &key);
-}
-
</del><span class="cx"> void DocumentOrderedMap::clear()
</span><span class="cx"> {
</span><span class="cx"> m_map.clear();
</span><span class="lines">@@ -126,8 +85,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<bool keyMatches(const AtomicStringImpl&, const Element&)>
-inline Element* DocumentOrderedMap::get(const AtomicStringImpl& key, const TreeScope& scope) const
</del><ins>+template <typename KeyMatchingFunction>
+inline Element* DocumentOrderedMap::get(const AtomicStringImpl& key, const TreeScope& scope, const KeyMatchingFunction& keyMatches) const
</ins><span class="cx"> {
</span><span class="cx"> m_map.checkConsistency();
</span><span class="cx">
</span><span class="lines">@@ -158,42 +117,59 @@
</span><span class="cx">
</span><span class="cx"> Element* DocumentOrderedMap::getElementById(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="cx"> {
</span><del>- return get<keyMatchesId>(key, scope);
</del><ins>+ return get(key, scope, [] (const AtomicStringImpl& key, const Element& element) {
+ return element.getIdAttribute().impl() == &key;
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Element* DocumentOrderedMap::getElementByName(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="cx"> {
</span><del>- return get<keyMatchesName>(key, scope);
</del><ins>+ return get(key, scope, [] (const AtomicStringImpl& key, const Element& element) {
+ return element.getNameAttribute().impl() == &key;
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLMapElement* DocumentOrderedMap::getElementByMapName(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="cx"> {
</span><del>- return downcast<HTMLMapElement>(get<keyMatchesMapName>(key, scope));
</del><ins>+ return downcast<HTMLMapElement>(get(key, scope, [] (const AtomicStringImpl& key, const Element& element) {
+ return is<HTMLMapElement>(element) && downcast<HTMLMapElement>(element).getName().impl() == &key;
+ }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLMapElement* DocumentOrderedMap::getElementByLowercasedMapName(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="cx"> {
</span><del>- return downcast<HTMLMapElement>(get<keyMatchesLowercasedMapName>(key, scope));
</del><ins>+ return downcast<HTMLMapElement>(get(key, scope, [] (const AtomicStringImpl& key, const Element& element) {
+ return is<HTMLMapElement>(element) && downcast<HTMLMapElement>(element).getName().lower().impl() == &key;
+ }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLImageElement* DocumentOrderedMap::getElementByLowercasedUsemap(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="cx"> {
</span><del>- return downcast<HTMLImageElement>(get<keyMatchesLowercasedUsemap>(key, scope));
</del><ins>+ return downcast<HTMLImageElement>(get(key, scope, [] (const AtomicStringImpl& key, const Element& element) {
+ // FIXME: HTML5 specification says we should match both image and object elements.
+ return is<HTMLImageElement>(element) && downcast<HTMLImageElement>(element).matchesLowercasedUsemap(key);
+ }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLLabelElement* DocumentOrderedMap::getElementByLabelForAttribute(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="cx"> {
</span><del>- return downcast<HTMLLabelElement>(get<keyMatchesLabelForAttribute>(key, scope));
</del><ins>+ return downcast<HTMLLabelElement>(get(key, scope, [] (const AtomicStringImpl& key, const Element& element) {
+ return is<HTMLLabelElement>(element) && element.fastGetAttribute(forAttr).impl() == &key;
+ }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Element* DocumentOrderedMap::getElementByWindowNamedItem(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="cx"> {
</span><del>- return get<keyMatchesWindowNamedItem>(key, scope);
</del><ins>+ return get(key, scope, [] (const AtomicStringImpl& key, const Element& element) {
+ return WindowNameCollection::elementMatches(element, &key);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Element* DocumentOrderedMap::getElementByDocumentNamedItem(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="cx"> {
</span><del>- return get<keyMatchesDocumentNamedItem>(key, scope);
</del><ins>+ return get(key, scope, [] (const AtomicStringImpl& key, const Element& element) {
+ return DocumentNameCollection::elementMatches(element, &key);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const Vector<Element*>* DocumentOrderedMap::getAllElementsById(const AtomicStringImpl& key, const TreeScope& scope) const
</span><span class="lines">@@ -216,7 +192,7 @@
</span><span class="cx"> auto end = elementDescandents.end();
</span><span class="cx"> for (; it != end; ++it) {
</span><span class="cx"> auto& element = *it;
</span><del>- if (!keyMatchesId(key, element))
</del><ins>+ if (element.getIdAttribute().impl() != &key)
</ins><span class="cx"> continue;
</span><span class="cx"> entry.orderedList.append(&element);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentOrderedMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentOrderedMap.h (175696 => 175697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentOrderedMap.h 2014-11-06 15:46:34 UTC (rev 175696)
+++ trunk/Source/WebCore/dom/DocumentOrderedMap.h 2014-11-06 16:00:24 UTC (rev 175697)
</span><span class="lines">@@ -68,7 +68,8 @@
</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&, const Element&)> Element* get(const AtomicStringImpl&, const TreeScope&) const;
</del><ins>+ template <typename KeyMatchingFunction>
+ Element* get(const AtomicStringImpl&, const TreeScope&, const KeyMatchingFunction&) const;
</ins><span class="cx">
</span><span class="cx"> struct MapEntry {
</span><span class="cx"> MapEntry()
</span></span></pre>
</div>
</div>
</body>
</html>