<!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>[207734] trunk/Source</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/207734">207734</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-23 15:55:44 -0700 (Sun, 23 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>addEventListener() / removeEventListener() should use a union for last parameter
https://bugs.webkit.org/show_bug.cgi?id=163863
Reviewed by Darin Adler.
Source/WebCore:
addEventListener() / removeEventListener() should use a union for last parameter:
- https://dom.spec.whatwg.org/#eventtarget
No new tests, no Web-exposed behavior change.
* bindings/js/JSDOMConvert.h:
* dom/EventTarget.cpp:
(WebCore::EventTarget::addEventListenerForBindings):
(WebCore::EventTarget::removeEventListenerForBindings):
* dom/EventTarget.h:
* dom/EventTarget.idl:
Source/WebKit/mac:
Cast BOOL to bool to help to compiler construct the new variant-type parameter.
* DOM/DOMNode.mm:
(-[DOMNode addEventListener:listener:useCapture:]):
(-[DOMNode addEventListener:::]):
(-[DOMNode removeEventListener:listener:useCapture:]):
(-[DOMNode removeEventListener:::]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMConverth">trunk/Source/WebCore/bindings/js/JSDOMConvert.h</a></li>
<li><a href="#trunkSourceWebCoredomEventTargetcpp">trunk/Source/WebCore/dom/EventTarget.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEventTargeth">trunk/Source/WebCore/dom/EventTarget.h</a></li>
<li><a href="#trunkSourceWebCoredomEventTargetidl">trunk/Source/WebCore/dom/EventTarget.idl</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMNodemm">trunk/Source/WebKit/mac/DOM/DOMNode.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207733 => 207734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-23 22:38:53 UTC (rev 207733)
+++ trunk/Source/WebCore/ChangeLog 2016-10-23 22:55:44 UTC (rev 207734)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-23 Chris Dumez <cdumez@apple.com>
+
+ addEventListener() / removeEventListener() should use a union for last parameter
+ https://bugs.webkit.org/show_bug.cgi?id=163863
+
+ Reviewed by Darin Adler.
+
+ addEventListener() / removeEventListener() should use a union for last parameter:
+ - https://dom.spec.whatwg.org/#eventtarget
+
+ No new tests, no Web-exposed behavior change.
+
+ * bindings/js/JSDOMConvert.h:
+ * dom/EventTarget.cpp:
+ (WebCore::EventTarget::addEventListenerForBindings):
+ (WebCore::EventTarget::removeEventListenerForBindings):
+ * dom/EventTarget.h:
+ * dom/EventTarget.idl:
+
</ins><span class="cx"> 2016-10-23 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not update selection rect on dirty lineboxes.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (207733 => 207734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-10-23 22:38:53 UTC (rev 207733)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-10-23 22:55:44 UTC (rev 207734)
</span><span class="lines">@@ -618,7 +618,7 @@
</span><span class="cx"> constexpr bool hasBooleanType = brigand::any<TypeList, std::is_same<IDLBoolean, brigand::_1>>::value;
</span><span class="cx"> if (hasBooleanType) {
</span><span class="cx"> if (value.isBoolean())
</span><del>- return std::move<WTF::CheckMoveParameter>(ConditionalConverter<ReturnType, bool, hasBooleanType>::convert(state, value).value());
</del><ins>+ return std::move<WTF::CheckMoveParameter>(ConditionalConverter<ReturnType, IDLBoolean, hasBooleanType>::convert(state, value).value());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 14. If V is a Number value, then:
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx">
</span><span class="cx"> // 17. If types includes a boolean, then return the result of converting V to boolean.
</span><span class="cx"> if (hasBooleanType)
</span><del>- return std::move<WTF::CheckMoveParameter>(ConditionalConverter<ReturnType, bool, hasBooleanType>::convert(state, value).value());
</del><ins>+ return std::move<WTF::CheckMoveParameter>(ConditionalConverter<ReturnType, IDLBoolean, hasBooleanType>::convert(state, value).value());
</ins><span class="cx">
</span><span class="cx"> // 18. Throw a TypeError.
</span><span class="cx"> throwTypeError(&state, scope);
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTarget.cpp (207733 => 207734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTarget.cpp 2016-10-23 22:38:53 UTC (rev 207733)
+++ trunk/Source/WebCore/dom/EventTarget.cpp 2016-10-23 22:55:44 UTC (rev 207734)
</span><span class="lines">@@ -82,18 +82,32 @@
</span><span class="cx"> return ensureEventTargetData().eventListenerMap.add(eventType, WTFMove(listener), { options.capture, options.passive, options.once });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventTarget::addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&& listener, const AddEventListenerOptions& options)
</del><ins>+void EventTarget::addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&& listener, AddEventListenerOptionsOrBoolean&& variant)
</ins><span class="cx"> {
</span><span class="cx"> if (!listener)
</span><span class="cx"> return;
</span><del>- addEventListener(eventType, listener.releaseNonNull(), options);
</del><ins>+
+ auto visitor = WTF::makeVisitor([&](const AddEventListenerOptions& options) {
+ addEventListener(eventType, listener.releaseNonNull(), options);
+ }, [&](bool useCapture) {
+ addEventListener(eventType, listener.releaseNonNull(), AddEventListenerOptions(useCapture));
+ });
+
+ WTF::visit(visitor, variant);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void EventTarget::removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&& listener, const ListenerOptions& options)
</del><ins>+void EventTarget::removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&& listener, ListenerOptionsOrBoolean&& variant)
</ins><span class="cx"> {
</span><span class="cx"> if (!listener)
</span><span class="cx"> return;
</span><del>- removeEventListener(eventType, *listener, options);
</del><ins>+
+ auto visitor = WTF::makeVisitor([&](const ListenerOptions& options) {
+ removeEventListener(eventType, *listener, options);
+ }, [&](bool useCapture) {
+ removeEventListener(eventType, *listener, ListenerOptions(useCapture));
+ });
+
+ WTF::visit(visitor, variant);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool EventTarget::removeEventListener(const AtomicString& eventType, EventListener& listener, const ListenerOptions& options)
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTarget.h (207733 => 207734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTarget.h 2016-10-23 22:38:53 UTC (rev 207733)
+++ trunk/Source/WebCore/dom/EventTarget.h 2016-10-23 22:55:44 UTC (rev 207734)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/Variant.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx"> class AtomicString;
</span><span class="lines">@@ -137,10 +138,11 @@
</span><span class="cx"> bool once;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- void addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, bool useCapture = false);
- void removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, bool useCapture = false);
- WEBCORE_EXPORT void addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, const AddEventListenerOptions&);
- WEBCORE_EXPORT void removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, const ListenerOptions&);
</del><ins>+ using AddEventListenerOptionsOrBoolean = WTF::Variant<AddEventListenerOptions, bool>;
+ WEBCORE_EXPORT void addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, AddEventListenerOptionsOrBoolean&&);
+
+ using ListenerOptionsOrBoolean = WTF::Variant<ListenerOptions, bool>;
+ WEBCORE_EXPORT void removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, ListenerOptionsOrBoolean&&);
</ins><span class="cx"> virtual bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions& = { });
</span><span class="cx"> virtual bool removeEventListener(const AtomicString& eventType, EventListener&, const ListenerOptions&);
</span><span class="cx">
</span><span class="lines">@@ -231,14 +233,4 @@
</span><span class="cx"> return d->eventListenerMap.containsCapturing(eventType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void EventTarget::addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&& listener, bool useCapture)
-{
- addEventListenerForBindings(eventType, WTFMove(listener), AddEventListenerOptions(useCapture));
-}
-
-inline void EventTarget::removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&& listener, bool useCapture)
-{
- removeEventListenerForBindings(eventType, WTFMove(listener), ListenerOptions(useCapture));
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargetidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTarget.idl (207733 => 207734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTarget.idl 2016-10-23 22:38:53 UTC (rev 207733)
+++ trunk/Source/WebCore/dom/EventTarget.idl 2016-10-23 22:55:44 UTC (rev 207734)
</span><span class="lines">@@ -24,17 +24,8 @@
</span><span class="cx"> JSCustomHeader,
</span><span class="cx"> JSCustomToNativeObject,
</span><span class="cx"> ] interface EventTarget {
</span><del>- // FIXME: Should be:
- // void addEventListener(DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options);
- // void removeEventListener(DOMString type, EventListener? callback, optional (EventListenerOptions or boolean) options);
- [ImplementedAs=addEventListenerForBindings] void addEventListener([AtomicString] DOMString type, EventListener? listener);
- [ImplementedAs=addEventListenerForBindings] void addEventListener([AtomicString] DOMString type, EventListener? listener, AddEventListenerOptions options);
- [ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomicString] DOMString type, EventListener? listener);
- [ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomicString] DOMString type, EventListener? listener, EventListenerOptions options);
-
- [ImplementedAs=addEventListenerForBindings] void addEventListener([AtomicString] DOMString type, EventListener? listener, boolean useCapture);
- [ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomicString] DOMString type, EventListener? listener, boolean useCapture);
-
</del><ins>+ [ImplementedAs=addEventListenerForBindings] void addEventListener([AtomicString] DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options = false);
+ [ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomicString] DOMString type, EventListener? callback, optional (EventListenerOptions or boolean) options = false);
</ins><span class="cx"> [ImplementedAs=dispatchEventForBindings, MayThrowLegacyException] boolean dispatchEvent(Event event);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (207733 => 207734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-23 22:38:53 UTC (rev 207733)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-23 22:55:44 UTC (rev 207734)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-23 Chris Dumez <cdumez@apple.com>
+
+ addEventListener() / removeEventListener() should use a union for last parameter
+ https://bugs.webkit.org/show_bug.cgi?id=163863
+
+ Reviewed by Darin Adler.
+
+ Cast BOOL to bool to help to compiler construct the new variant-type parameter.
+
+ * DOM/DOMNode.mm:
+ (-[DOMNode addEventListener:listener:useCapture:]):
+ (-[DOMNode addEventListener:::]):
+ (-[DOMNode removeEventListener:listener:useCapture:]):
+ (-[DOMNode removeEventListener:::]):
+
</ins><span class="cx"> 2016-10-21 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Support (insertFrom|deleteBy)Composition and (insert|delete)CompositionText inputTypes for InputEvents
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMNode.mm (207733 => 207734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMNode.mm 2016-10-23 22:38:53 UTC (rev 207733)
+++ trunk/Source/WebKit/mac/DOM/DOMNode.mm 2016-10-23 22:55:44 UTC (rev 207734)
</span><span class="lines">@@ -355,25 +355,25 @@
</span><span class="cx"> - (void)addEventListener:(NSString *)type listener:(id <DOMEventListener>)listener useCapture:(BOOL)useCapture
</span><span class="cx"> {
</span><span class="cx"> JSMainThreadNullState state;
</span><del>- unwrap(*self).addEventListenerForBindings(type, ObjCEventListener::wrap(listener), useCapture);
</del><ins>+ unwrap(*self).addEventListenerForBindings(type, ObjCEventListener::wrap(listener), static_cast<bool>(useCapture));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)addEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture
</span><span class="cx"> {
</span><span class="cx"> JSMainThreadNullState state;
</span><del>- unwrap(*self).addEventListenerForBindings(type, ObjCEventListener::wrap(listener), useCapture);
</del><ins>+ unwrap(*self).addEventListenerForBindings(type, ObjCEventListener::wrap(listener), static_cast<bool>(useCapture));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)removeEventListener:(NSString *)type listener:(id <DOMEventListener>)listener useCapture:(BOOL)useCapture
</span><span class="cx"> {
</span><span class="cx"> JSMainThreadNullState state;
</span><del>- unwrap(*self).removeEventListenerForBindings(type, ObjCEventListener::wrap(listener), useCapture);
</del><ins>+ unwrap(*self).removeEventListenerForBindings(type, ObjCEventListener::wrap(listener), static_cast<bool>(useCapture));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)removeEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture
</span><span class="cx"> {
</span><span class="cx"> JSMainThreadNullState state;
</span><del>- unwrap(*self).removeEventListenerForBindings(type, ObjCEventListener::wrap(listener), useCapture);
</del><ins>+ unwrap(*self).removeEventListenerForBindings(type, ObjCEventListener::wrap(listener), static_cast<bool>(useCapture));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)dispatchEvent:(DOMEvent *)event
</span></span></pre>
</div>
</div>
</body>
</html>