<!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>[164125] 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/164125">164125</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-14 13:00:19 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up JSDOMStringMap::deleteProperty
https://bugs.webkit.org/show_bug.cgi?id=128801
Reviewed by Geoffrey Garen.
Follow up on my cleaning of JSDOMStringMapCustom, this time for deletion.
Previously, we would query for the name, then call deleteItem() if the name was
found. Instead, everything is moved to deleteItem which then return if the deletion
is successful or not.
By using convertPropertyNameToAttributeName, we can use Element::hasAttribute() directly
to find if the attribute exists or not. If it exists, we remove it.
Theoretically we could have a single pass over the attributes to find->delete but this
code is not hot enough to justify anything fancy at this point.
Finally, we no longer check for isValidPropertyName() on deletion. JSDOMStringMapCustom
was the last client of DatasetDOMStringMap::deleteItem() and it could not call deleteItem()
with invalid name since the name would have failed DatasetDOMStringMap::contains().
The spec does not specify any name checking either for deletion so we are safe just ignoring
invalid input.
* bindings/js/JSDOMStringMapCustom.cpp:
(WebCore::JSDOMStringMap::deleteProperty):
* dom/DatasetDOMStringMap.cpp:
(WebCore::DatasetDOMStringMap::deleteItem):
* dom/DatasetDOMStringMap.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMStringMapCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDatasetDOMStringMapcpp">trunk/Source/WebCore/dom/DatasetDOMStringMap.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDatasetDOMStringMaph">trunk/Source/WebCore/dom/DatasetDOMStringMap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164124 => 164125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-14 20:59:27 UTC (rev 164124)
+++ trunk/Source/WebCore/ChangeLog 2014-02-14 21:00:19 UTC (rev 164125)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-02-14 Benjamin Poulain <benjamin@webkit.org>
+
+ Clean up JSDOMStringMap::deleteProperty
+ https://bugs.webkit.org/show_bug.cgi?id=128801
+
+ Reviewed by Geoffrey Garen.
+
+ Follow up on my cleaning of JSDOMStringMapCustom, this time for deletion.
+
+ Previously, we would query for the name, then call deleteItem() if the name was
+ found. Instead, everything is moved to deleteItem which then return if the deletion
+ is successful or not.
+
+ By using convertPropertyNameToAttributeName, we can use Element::hasAttribute() directly
+ to find if the attribute exists or not. If it exists, we remove it.
+
+ Theoretically we could have a single pass over the attributes to find->delete but this
+ code is not hot enough to justify anything fancy at this point.
+
+ Finally, we no longer check for isValidPropertyName() on deletion. JSDOMStringMapCustom
+ was the last client of DatasetDOMStringMap::deleteItem() and it could not call deleteItem()
+ with invalid name since the name would have failed DatasetDOMStringMap::contains().
+ The spec does not specify any name checking either for deletion so we are safe just ignoring
+ invalid input.
+
+ * bindings/js/JSDOMStringMapCustom.cpp:
+ (WebCore::JSDOMStringMap::deleteProperty):
+ * dom/DatasetDOMStringMap.cpp:
+ (WebCore::DatasetDOMStringMap::deleteItem):
+ * dom/DatasetDOMStringMap.h:
+
</ins><span class="cx"> 2014-02-14 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve the performance on mobile of FTPDirectoryDocument
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMStringMapCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp (164124 => 164125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp 2014-02-14 20:59:27 UTC (rev 164124)
+++ trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp 2014-02-14 21:00:19 UTC (rev 164125)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "JSDOMStringMap.h"
</span><span class="cx">
</span><span class="cx"> #include "DOMStringMap.h"
</span><del>-#include "Element.h"
</del><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><span class="lines">@@ -58,16 +57,10 @@
</span><span class="cx"> Base::getOwnPropertyNames(thisObject, exec, propertyNames, mode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSDOMStringMap::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
</del><ins>+bool JSDOMStringMap::deleteProperty(JSCell* cell, ExecState*, PropertyName propertyName)
</ins><span class="cx"> {
</span><span class="cx"> JSDOMStringMap* thisObject = jsCast<JSDOMStringMap*>(cell);
</span><del>- AtomicString stringName = propertyNameToAtomicString(propertyName);
- if (!thisObject->m_impl->contains(stringName))
- return false;
- ExceptionCode ec = 0;
- thisObject->m_impl->deleteItem(stringName, ec);
- setDOMException(exec, ec);
- return !ec;
</del><ins>+ return thisObject->m_impl->deleteItem(propertyNameToString(propertyName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSDOMStringMap::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned index)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDatasetDOMStringMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DatasetDOMStringMap.cpp (164124 => 164125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DatasetDOMStringMap.cpp 2014-02-14 20:59:27 UTC (rev 164124)
+++ trunk/Source/WebCore/dom/DatasetDOMStringMap.cpp 2014-02-14 21:00:19 UTC (rev 164125)
</span><span class="lines">@@ -191,19 +191,6 @@
</span><span class="cx"> return nullAtom;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DatasetDOMStringMap::contains(const String& name)
-{
- if (!m_element.hasAttributes())
- return false;
-
- for (const Attribute& attribute : m_element.attributesIterator()) {
- if (propertyNameMatchesAttributeName(name, attribute.localName()))
- return true;
- }
-
- return false;
-}
-
</del><span class="cx"> void DatasetDOMStringMap::setItem(const String& name, const String& value, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (!isValidPropertyName(name)) {
</span><span class="lines">@@ -214,14 +201,14 @@
</span><span class="cx"> m_element.setAttribute(convertPropertyNameToAttributeName(name), value, ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatasetDOMStringMap::deleteItem(const String& name, ExceptionCode& ec)
</del><ins>+bool DatasetDOMStringMap::deleteItem(const String& name)
</ins><span class="cx"> {
</span><del>- if (!isValidPropertyName(name)) {
- ec = SYNTAX_ERR;
- return;
- }
</del><ins>+ AtomicString attributeName = convertPropertyNameToAttributeName(name);
+ if (!m_element.hasAttribute(attributeName))
+ return false;
</ins><span class="cx">
</span><del>- m_element.removeAttribute(convertPropertyNameToAttributeName(name));
</del><ins>+ m_element.removeAttribute(attributeName);
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomDatasetDOMStringMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DatasetDOMStringMap.h (164124 => 164125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DatasetDOMStringMap.h 2014-02-14 20:59:27 UTC (rev 164124)
+++ trunk/Source/WebCore/dom/DatasetDOMStringMap.h 2014-02-14 21:00:19 UTC (rev 164125)
</span><span class="lines">@@ -49,9 +49,8 @@
</span><span class="cx">
</span><span class="cx"> void getNames(Vector<String>&);
</span><span class="cx"> const AtomicString& item(const String& name, bool& isValid);
</span><del>- bool contains(const String& name);
</del><span class="cx"> void setItem(const String& name, const String& value, ExceptionCode&);
</span><del>- void deleteItem(const String& name, ExceptionCode&);
</del><ins>+ bool deleteItem(const String& name);
</ins><span class="cx">
</span><span class="cx"> Element* element() { return &m_element; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>