<!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>[200557] 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/200557">200557</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-05-08 11:35:23 -0700 (Sun, 08 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change HTMLSlotElement::assignedNodes to take a IDL dictionary instead of a WebCore::Dictionary
https://bugs.webkit.org/show_bug.cgi?id=157457
Reviewed by Chris Dumez.
* html/HTMLSlotElement.cpp:
(WebCore::HTMLSlotElement::removedFrom): Fixed typo in comment.
(WebCore::HTMLSlotElement::assignedNodes): Renamed assignedNodesForBindings back to this
and changed the argument type to Optional<AssignedNodesOptions> instead of Dictionary.
Also streamlined the logic a bit.
(WebCore::HTMLSlotElement::enqueueSlotChangeEvent): Changed to use a pointer to the
enqueued event instead of a boolean. With only a boolean, we could end up clearing the
flag in cases where we don't really want to.
(WebCore::HTMLSlotElement::dispatchEvent): Ditto.
(WebCore::HTMLSlotElement::assignedNodesForBindings): Deleted.
* html/HTMLSlotElement.h: Use pragma once. Added AssignedNodeOptions. Changed for the
above, including changing the data member.
* html/HTMLSlotElement.idl: Removed use of ImplementedAs. Fixed the type of the options
dictionary.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSlotElementcpp">trunk/Source/WebCore/html/HTMLSlotElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSlotElementh">trunk/Source/WebCore/html/HTMLSlotElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSlotElementidl">trunk/Source/WebCore/html/HTMLSlotElement.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200556 => 200557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-08 18:29:04 UTC (rev 200556)
+++ trunk/Source/WebCore/ChangeLog 2016-05-08 18:35:23 UTC (rev 200557)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-05-07 Darin Adler <darin@apple.com>
+
+ Change HTMLSlotElement::assignedNodes to take a IDL dictionary instead of a WebCore::Dictionary
+ https://bugs.webkit.org/show_bug.cgi?id=157457
+
+ Reviewed by Chris Dumez.
+
+ * html/HTMLSlotElement.cpp:
+ (WebCore::HTMLSlotElement::removedFrom): Fixed typo in comment.
+ (WebCore::HTMLSlotElement::assignedNodes): Renamed assignedNodesForBindings back to this
+ and changed the argument type to Optional<AssignedNodesOptions> instead of Dictionary.
+ Also streamlined the logic a bit.
+ (WebCore::HTMLSlotElement::enqueueSlotChangeEvent): Changed to use a pointer to the
+ enqueued event instead of a boolean. With only a boolean, we could end up clearing the
+ flag in cases where we don't really want to.
+ (WebCore::HTMLSlotElement::dispatchEvent): Ditto.
+ (WebCore::HTMLSlotElement::assignedNodesForBindings): Deleted.
+ * html/HTMLSlotElement.h: Use pragma once. Added AssignedNodeOptions. Changed for the
+ above, including changing the data member.
+ * html/HTMLSlotElement.idl: Removed use of ImplementedAs. Fixed the type of the options
+ dictionary.
+
</ins><span class="cx"> 2016-05-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Bindings] Add convert<>() template specializations for integer types
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSlotElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSlotElement.cpp (200556 => 200557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSlotElement.cpp 2016-05-08 18:29:04 UTC (rev 200556)
+++ trunk/Source/WebCore/html/HTMLSlotElement.cpp 2016-05-08 18:35:23 UTC (rev 200557)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><span class="cx">
</span><del>-#include "Dictionary.h"
-#include "ElementChildIterator.h"
</del><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="lines">@@ -68,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLSlotElement::removedFrom(ContainerNode& insertionPoint)
</span><span class="cx"> {
</span><del>- // ContainerNode::removeBetween always sets the removed chid's tree scope to Document's but InShadowRoot flag is unset in Node::removedFrom.
</del><ins>+ // ContainerNode::removeBetween always sets the removed child's tree scope to Document's but InShadowRoot flag is unset in Node::removedFrom.
</ins><span class="cx"> // So if InShadowRoot flag is set but this element's tree scope is Document's, this element has just been removed from a shadow root.
</span><span class="cx"> if (insertionPoint.isInShadowTree() && isInShadowTree() && &treeScope() == &document()) {
</span><span class="cx"> auto* oldShadowRoot = insertionPoint.containingShadowRoot();
</span><span class="lines">@@ -112,42 +110,37 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const Vector<Node*> HTMLSlotElement::assignedNodesForBindings(const Dictionary& options) const
</del><ins>+Vector<Node*> HTMLSlotElement::assignedNodes(const AssignedNodesOptions& options) const
</ins><span class="cx"> {
</span><del>- bool shouldFlatten = false;
- options.get("flatten", shouldFlatten);
-
- Vector<Node*> nodes;
</del><span class="cx"> auto* assignedNodes = this->assignedNodes();
</span><span class="cx"> if (!assignedNodes)
</span><del>- return nodes;
</del><ins>+ return { };
</ins><span class="cx">
</span><del>- if (shouldFlatten)
- flattenAssignedNodes(nodes, *assignedNodes);
- else
- nodes = *assignedNodes;
</del><ins>+ if (!options.flatten)
+ return *assignedNodes;
</ins><span class="cx">
</span><ins>+ Vector<Node*> nodes;
+ flattenAssignedNodes(nodes, *assignedNodes);
</ins><span class="cx"> return nodes;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLSlotElement::enqueueSlotChangeEvent()
</span><span class="cx"> {
</span><del>- if (m_hasEnqueuedSlotChangeEvent)
</del><ins>+ if (m_enqueuedSlotChangeEvent)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool bubbles = false;
</span><span class="cx"> bool cancelable = false;
</span><span class="cx"> auto event = Event::create(eventNames().slotchangeEvent, bubbles, cancelable);
</span><span class="cx"> event->setTarget(this);
</span><ins>+ m_enqueuedSlotChangeEvent = event.ptr();
</ins><span class="cx"> document().enqueueSlotchangeEvent(WTFMove(event));
</span><del>-
- m_hasEnqueuedSlotChangeEvent = true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLSlotElement::dispatchEvent(Event& event)
</span><span class="cx"> {
</span><del>- if (event.type() == eventNames().slotchangeEvent)
- m_hasEnqueuedSlotChangeEvent = false;
</del><ins>+ if (&event == m_enqueuedSlotChangeEvent)
+ m_enqueuedSlotChangeEvent = nullptr;
</ins><span class="cx"> return HTMLElement::dispatchEvent(event);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSlotElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSlotElement.h (200556 => 200557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSlotElement.h 2016-05-08 18:29:04 UTC (rev 200556)
+++ trunk/Source/WebCore/html/HTMLSlotElement.h 2016-05-08 18:35:23 UTC (rev 200557)
</span><span class="lines">@@ -23,13 +23,11 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef HTMLSlotElement_h
-#define HTMLSlotElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><span class="cx">
</span><span class="cx"> #include "HTMLElement.h"
</span><del>-#include "Range.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -38,23 +36,24 @@
</span><span class="cx"> static Ref<HTMLSlotElement> create(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> const Vector<Node*>* assignedNodes() const;
</span><del>- const Vector<Node*> assignedNodesForBindings(const Dictionary& options) const;
</del><ins>+ struct AssignedNodesOptions {
+ bool flatten;
+ };
+ Vector<Node*> assignedNodes(const AssignedNodesOptions&) const;
</ins><span class="cx">
</span><span class="cx"> void enqueueSlotChangeEvent();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLSlotElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><del>- InsertionNotificationRequest insertedInto(ContainerNode&) override;
- void removedFrom(ContainerNode&) override;
- void attributeChanged(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason) override;
</del><ins>+ InsertionNotificationRequest insertedInto(ContainerNode&) final;
+ void removedFrom(ContainerNode&) final;
+ void attributeChanged(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason) final;
+ bool dispatchEvent(Event&) final;
</ins><span class="cx">
</span><del>- bool dispatchEvent(Event&) override;
-
- bool m_hasEnqueuedSlotChangeEvent { false };
</del><ins>+ Event* m_enqueuedSlotChangeEvent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSlotElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSlotElement.idl (200556 => 200557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSlotElement.idl 2016-05-08 18:29:04 UTC (rev 200556)
+++ trunk/Source/WebCore/html/HTMLSlotElement.idl 2016-05-08 18:35:23 UTC (rev 200557)
</span><span class="lines">@@ -23,14 +23,15 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// https://w3c.github.io/webcomponents/spec/shadow/#idl-def-HTMLSlotElement
</del><span class="cx"> [
</span><span class="cx"> Conditional=SHADOW_DOM,
</span><span class="cx"> EnabledAtRuntime=ShadowDOM,
</span><span class="cx"> JSGenerateToNativeObject
</span><span class="cx"> ] interface HTMLSlotElement : HTMLElement {
</span><del>-
</del><span class="cx"> [Reflect] attribute DOMString name;
</span><del>- [ImplementedAs=assignedNodesForBindings] sequence<Node> assignedNodes(optional Dictionary options);
</del><ins>+ sequence<Node> assignedNodes(optional AssignedNodesOptions options);
+};
</ins><span class="cx">
</span><ins>+dictionary AssignedNodesOptions {
+ boolean flatten = false;
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>