<!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>[163239] trunk</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/163239">163239</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-01 00:10:27 -0800 (Sat, 01 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve the JavaScript bindings of DatasetDOMStringMap
https://bugs.webkit.org/show_bug.cgi?id=127971
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-02-01
Reviewed by Sam Weinig.
Source/WebCore:
Instead of querying contains() followed by item(), just get the item
at once in the custom binding.
Test: fast/dom/dataset-name-getter-properties.html
* bindings/js/JSDOMStringMapCustom.cpp:
(WebCore::JSDOMStringMap::getOwnPropertySlotDelegate):
* dom/DOMStringMap.idl:
* dom/DatasetDOMStringMap.cpp:
(WebCore::DatasetDOMStringMap::item):
* dom/DatasetDOMStringMap.h:
LayoutTests:
* fast/dom/dataset-name-getter-properties-expected.txt: Added.
* fast/dom/dataset-name-getter-properties.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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="#trunkSourceWebCoredomDOMStringMapidl">trunk/Source/WebCore/dom/DOMStringMap.idl</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomdatasetnamegetterpropertiesexpectedtxt">trunk/LayoutTests/fast/dom/dataset-name-getter-properties-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomdatasetnamegetterpropertieshtml">trunk/LayoutTests/fast/dom/dataset-name-getter-properties.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163238 => 163239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-01 08:05:21 UTC (rev 163238)
+++ trunk/LayoutTests/ChangeLog 2014-02-01 08:10:27 UTC (rev 163239)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-01 Benjamin Poulain <bpoulain@apple.com>
+
+ Improve the JavaScript bindings of DatasetDOMStringMap
+ https://bugs.webkit.org/show_bug.cgi?id=127971
+
+ Reviewed by Sam Weinig.
+
+ * fast/dom/dataset-name-getter-properties-expected.txt: Added.
+ * fast/dom/dataset-name-getter-properties.html: Added.
+
</ins><span class="cx"> 2014-01-31 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r163195 and related patches
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomdatasetnamegetterpropertiesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/dataset-name-getter-properties-expected.txt (0 => 163239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/dataset-name-getter-properties-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/dataset-name-getter-properties-expected.txt 2014-02-01 08:10:27 UTC (rev 163239)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Test the JavaScript property descriptor of the name getter.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Object.getOwnPropertyDescriptor(document.body.dataset, 'webkitRocks').configurable is false
+PASS Object.getOwnPropertyDescriptor(document.body.dataset, 'webkitRocks').enumerable is false
+PASS Object.getOwnPropertyDescriptor(document.body.dataset, 'webkitRocks').writable is false
+PASS Object.getOwnPropertyDescriptor(document.body.dataset, 'webkitRocks').value is "yes"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomdatasetnamegetterpropertieshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/dataset-name-getter-properties.html (0 => 163239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/dataset-name-getter-properties.html (rev 0)
+++ trunk/LayoutTests/fast/dom/dataset-name-getter-properties.html 2014-02-01 08:10:27 UTC (rev 163239)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body data-webkit-rocks=yes>
+<script>
+description('Test the JavaScript property descriptor of the name getter.');
+
+shouldBe("Object.getOwnPropertyDescriptor(document.body.dataset, 'webkitRocks').configurable", 'false');
+shouldBe("Object.getOwnPropertyDescriptor(document.body.dataset, 'webkitRocks').enumerable", 'false');
+shouldBe("Object.getOwnPropertyDescriptor(document.body.dataset, 'webkitRocks').writable", 'false');
+shouldBeEqualToString("Object.getOwnPropertyDescriptor(document.body.dataset, 'webkitRocks').value", 'yes');
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163238 => 163239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-01 08:05:21 UTC (rev 163238)
+++ trunk/Source/WebCore/ChangeLog 2014-02-01 08:10:27 UTC (rev 163239)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-01 Benjamin Poulain <bpoulain@apple.com>
+
+ Improve the JavaScript bindings of DatasetDOMStringMap
+ https://bugs.webkit.org/show_bug.cgi?id=127971
+
+ Reviewed by Sam Weinig.
+
+ Instead of querying contains() followed by item(), just get the item
+ at once in the custom binding.
+
+ Test: fast/dom/dataset-name-getter-properties.html
+
+ * bindings/js/JSDOMStringMapCustom.cpp:
+ (WebCore::JSDOMStringMap::getOwnPropertySlotDelegate):
+ * dom/DOMStringMap.idl:
+ * dom/DatasetDOMStringMap.cpp:
+ (WebCore::DatasetDOMStringMap::item):
+ * dom/DatasetDOMStringMap.h:
+
</ins><span class="cx"> 2014-01-31 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove LEGACY_VIEWPORT_ADAPTION
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMStringMapCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp (163238 => 163239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp 2014-02-01 08:05:21 UTC (rev 163238)
+++ trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp 2014-02-01 08:10:27 UTC (rev 163239)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -35,17 +35,17 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool JSDOMStringMap::canGetItemsForName(ExecState*, DOMStringMap* impl, PropertyName propertyName)
</del><ins>+bool JSDOMStringMap::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</ins><span class="cx"> {
</span><del>- return impl->contains(propertyNameToAtomicString(propertyName));
</del><ins>+ bool nameIsValid;
+ const AtomicString& item = impl().item(propertyNameToString(propertyName), nameIsValid);
+ if (nameIsValid) {
+ slot.setValue(this, ReadOnly | DontDelete | DontEnum, toJS(exec, globalObject(), item));
+ return true;
+ }
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSDOMStringMap::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
-{
- JSDOMStringMap* thisObj = jsCast<JSDOMStringMap*>(JSValue::decode(slotBase));
- return JSValue::encode(jsStringWithCache(exec, thisObj->impl().item(propertyNameToAtomicString(propertyName))));
-}
-
</del><span class="cx"> void JSDOMStringMap::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span><span class="cx"> {
</span><span class="cx"> JSDOMStringMap* thisObject = jsCast<JSDOMStringMap*>(object);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMStringMapidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMStringMap.idl (163238 => 163239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMStringMap.idl 2014-02-01 08:05:21 UTC (rev 163238)
+++ trunk/Source/WebCore/dom/DOMStringMap.idl 2014-02-01 08:10:27 UTC (rev 163239)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx"> CustomDeleteProperty,
</span><span class="cx"> CustomEnumerateProperty,
</span><span class="cx"> CustomNamedSetter,
</span><ins>+ JSCustomGetOwnPropertySlotAndDescriptor,
</ins><span class="cx"> SkipVTableValidation,
</span><span class="cx"> ] interface DOMStringMap {
</span><del>- getter DOMString (DOMString name);
</del><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDatasetDOMStringMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DatasetDOMStringMap.cpp (163238 => 163239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DatasetDOMStringMap.cpp 2014-02-01 08:05:21 UTC (rev 163238)
+++ trunk/Source/WebCore/dom/DatasetDOMStringMap.cpp 2014-02-01 08:10:27 UTC (rev 163239)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -144,17 +144,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DatasetDOMStringMap::item(const String& name)
</del><ins>+const AtomicString& DatasetDOMStringMap::item(const String& name, bool& isValid)
</ins><span class="cx"> {
</span><del>- if (!m_element.hasAttributes())
- return String();
-
- for (const Attribute& attribute : m_element.attributesIterator()) {
- if (propertyNameMatchesAttributeName(name, attribute.localName()))
- return attribute.value();
</del><ins>+ isValid = false;
+ if (m_element.hasAttributes()) {
+ for (const Attribute& attribute : m_element.attributesIterator()) {
+ if (propertyNameMatchesAttributeName(name, attribute.localName())) {
+ isValid = true;
+ return attribute.value();
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return String();
</del><ins>+ return nullAtom;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DatasetDOMStringMap::contains(const String& name)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDatasetDOMStringMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DatasetDOMStringMap.h (163238 => 163239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DatasetDOMStringMap.h 2014-02-01 08:05:21 UTC (rev 163238)
+++ trunk/Source/WebCore/dom/DatasetDOMStringMap.h 2014-02-01 08:10:27 UTC (rev 163239)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><ins>+#include <wtf/text/AtomicString.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx"> void deref();
</span><span class="cx">
</span><span class="cx"> void getNames(Vector<String>&);
</span><del>- String item(const String& name);
</del><ins>+ const AtomicString& item(const String& name, bool& isValid);
</ins><span class="cx"> bool contains(const String& name);
</span><span class="cx"> void setItem(const String& name, const String& value, ExceptionCode&);
</span><span class="cx"> void deleteItem(const String& name, ExceptionCode&);
</span></span></pre>
</div>
</div>
</body>
</html>