<!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>[202178] 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/202178">202178</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-17 13:51:11 -0700 (Fri, 17 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>TouchEvent should have a constructor
https://bugs.webkit.org/show_bug.cgi?id=158883
<rdar://problem/26063585>
Reviewed by Benjamin Poulain.
Source/WebCore:
TouchEvent should have a constructor:
- https://w3c.github.io/touch-events/#touchevent-interface
Chrome already ships this:
- https://bugs.chromium.org/p/chromium/issues/detail?id=508675
Test: fast/events/touch/touch-event-constructor.html
* bindings/js/JSDictionary.cpp:
(WebCore::JSDictionary::convertValue):
* bindings/js/JSDictionary.h:
* dom/TouchEvent.cpp:
(WebCore::TouchEvent::TouchEvent):
* dom/TouchEvent.h:
* dom/TouchEvent.idl:
LayoutTests:
Add layout test coverage for the TouchEvent constructor.
* fast/events/touch/touch-event-constructor-expected.txt: Added.
* fast/events/touch/touch-event-constructor.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="#trunkSourceWebCorebindingsjsJSDictionarycpp">trunk/Source/WebCore/bindings/js/JSDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionaryh">trunk/Source/WebCore/bindings/js/JSDictionary.h</a></li>
<li><a href="#trunkSourceWebCoredomTouchEventcpp">trunk/Source/WebCore/dom/TouchEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTouchEventh">trunk/Source/WebCore/dom/TouchEvent.h</a></li>
<li><a href="#trunkSourceWebCoredomTouchEventidl">trunk/Source/WebCore/dom/TouchEvent.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventstouchtoucheventconstructorexpectedtxt">trunk/LayoutTests/fast/events/touch/touch-event-constructor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchtoucheventconstructorhtml">trunk/LayoutTests/fast/events/touch/touch-event-constructor.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202177 => 202178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-17 20:21:17 UTC (rev 202177)
+++ trunk/LayoutTests/ChangeLog 2016-06-17 20:51:11 UTC (rev 202178)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-06-17 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ TouchEvent should have a constructor
+ https://bugs.webkit.org/show_bug.cgi?id=158883
+ <rdar://problem/26063585>
+
+ Reviewed by Benjamin Poulain.
+
+ Add layout test coverage for the TouchEvent constructor.
+
+ * fast/events/touch/touch-event-constructor-expected.txt: Added.
+ * fast/events/touch/touch-event-constructor.html: Added.
+
+2016-06-17 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> URL hash setter does not remove fragment identifier if argument is an empty string
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158869
</span><span class="cx"> <rdar://problem/26863430>
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchtoucheventconstructorexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/touch-event-constructor-expected.txt (0 => 202178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/touch-event-constructor-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/touch-event-constructor-expected.txt 2016-06-17 20:51:11 UTC (rev 202178)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+Test the TouchEvent constructor
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS ev = new TouchEvent('touchstart') did not throw exception.
+PASS ev.__proto__ is TouchEvent.prototype
+PASS ev.type is "touchstart"
+PASS ev.touches.length is 0
+PASS ev.targetTouches.length is 0
+PASS ev.changedTouches.length is 0
+PASS ev.bubbles is false
+PASS ev = new TouchEvent('touchmove', { touches: listA, bubbles: true }) did not throw exception.
+PASS ev.__proto__ is TouchEvent.prototype
+PASS ev.type is "touchmove"
+PASS ev.touches.length is 1
+PASS ev.targetTouches.length is 0
+PASS ev.changedTouches.length is 0
+PASS ev.bubbles is true
+PASS ev = new TouchEvent('touchmove', { targetTouches: listB, bubbles: true }) did not throw exception.
+PASS ev.__proto__ is TouchEvent.prototype
+PASS ev.type is "touchmove"
+PASS ev.touches.length is 0
+PASS ev.targetTouches.length is 2
+PASS ev.changedTouches.length is 0
+PASS ev.bubbles is true
+PASS ev = new TouchEvent('touchmove', { changedTouches: listC, bubbles: true }) did not throw exception.
+PASS ev.__proto__ is TouchEvent.prototype
+PASS ev.type is "touchmove"
+PASS ev.touches.length is 0
+PASS ev.targetTouches.length is 0
+PASS ev.changedTouches.length is 3
+PASS ev.bubbles is true
+PASS ev = new TouchEvent('touchmove', { touches: listA, targetTouches: listB, changedTouches: listC, bubbles: true }) did not throw exception.
+PASS ev.__proto__ is TouchEvent.prototype
+PASS ev.type is "touchmove"
+PASS ev.touches.length is 1
+PASS ev.targetTouches.length is 2
+PASS ev.changedTouches.length is 3
+PASS ev.bubbles is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchtoucheventconstructorhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/touch-event-constructor.html (0 => 202178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/touch-event-constructor.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/touch-event-constructor.html 2016-06-17 20:51:11 UTC (rev 202178)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+description("Test the TouchEvent constructor");
+
+// No dictionary.
+shouldNotThrow("ev = new TouchEvent('touchstart')");
+shouldBe("ev.__proto__", "TouchEvent.prototype");
+shouldBeEqualToString("ev.type", "touchstart");
+shouldBe("ev.touches.length", "0");
+shouldBe("ev.targetTouches.length", "0");
+shouldBe("ev.changedTouches.length", "0");
+shouldBeFalse("ev.bubbles");
+
+// With dictionary.
+var touch = document.createTouch(window, document.body, 12341, 60, 65, 100, 105);
+var listA = document.createTouchList(touch);
+var listB = document.createTouchList(touch, touch);
+var listC = document.createTouchList(touch, touch, touch);
+shouldNotThrow("ev = new TouchEvent('touchmove', { touches: listA, bubbles: true })");
+shouldBe("ev.__proto__", "TouchEvent.prototype");
+shouldBeEqualToString("ev.type", "touchmove");
+shouldBe("ev.touches.length", "1");
+shouldBe("ev.targetTouches.length", "0");
+shouldBe("ev.changedTouches.length", "0");
+shouldBeTrue("ev.bubbles");
+
+shouldNotThrow("ev = new TouchEvent('touchmove', { targetTouches: listB, bubbles: true })");
+shouldBe("ev.__proto__", "TouchEvent.prototype");
+shouldBeEqualToString("ev.type", "touchmove");
+shouldBe("ev.touches.length", "0");
+shouldBe("ev.targetTouches.length", "2");
+shouldBe("ev.changedTouches.length", "0");
+shouldBeTrue("ev.bubbles");
+
+shouldNotThrow("ev = new TouchEvent('touchmove', { changedTouches: listC, bubbles: true })");
+shouldBe("ev.__proto__", "TouchEvent.prototype");
+shouldBeEqualToString("ev.type", "touchmove");
+shouldBe("ev.touches.length", "0");
+shouldBe("ev.targetTouches.length", "0");
+shouldBe("ev.changedTouches.length", "3");
+shouldBeTrue("ev.bubbles");
+
+shouldNotThrow("ev = new TouchEvent('touchmove', { touches: listA, targetTouches: listB, changedTouches: listC, bubbles: true })");
+shouldBe("ev.__proto__", "TouchEvent.prototype");
+shouldBeEqualToString("ev.type", "touchmove");
+shouldBe("ev.touches.length", "1");
+shouldBe("ev.targetTouches.length", "2");
+shouldBe("ev.changedTouches.length", "3");
+shouldBeTrue("ev.bubbles");
+
+</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 (202177 => 202178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-17 20:21:17 UTC (rev 202177)
+++ trunk/Source/WebCore/ChangeLog 2016-06-17 20:51:11 UTC (rev 202178)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-06-17 Chris Dumez <cdumez@apple.com>
+
+ TouchEvent should have a constructor
+ https://bugs.webkit.org/show_bug.cgi?id=158883
+ <rdar://problem/26063585>
+
+ Reviewed by Benjamin Poulain.
+
+ TouchEvent should have a constructor:
+ - https://w3c.github.io/touch-events/#touchevent-interface
+
+ Chrome already ships this:
+ - https://bugs.chromium.org/p/chromium/issues/detail?id=508675
+
+ Test: fast/events/touch/touch-event-constructor.html
+
+ * bindings/js/JSDictionary.cpp:
+ (WebCore::JSDictionary::convertValue):
+ * bindings/js/JSDictionary.h:
+ * dom/TouchEvent.cpp:
+ (WebCore::TouchEvent::TouchEvent):
+ * dom/TouchEvent.h:
+ * dom/TouchEvent.idl:
+
</ins><span class="cx"> 2016-06-17 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Potential null dereferencing on a detached positioned renderer.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.cpp (202177 => 202178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-06-17 20:21:17 UTC (rev 202177)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-06-17 20:51:11 UTC (rev 202178)
</span><span class="lines">@@ -67,6 +67,10 @@
</span><span class="cx"> #include "JSGamepad.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(TOUCH_EVENTS)
+#include "JSTouchList.h"
+#endif
+
</ins><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -326,6 +330,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(TOUCH_EVENTS)
+void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr<TouchList>& result)
+{
+ result = JSTouchList::toWrapped(value);
+}
+#endif
+
</ins><span class="cx"> void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, JSC::JSFunction*& result)
</span><span class="cx"> {
</span><span class="cx"> result = jsDynamicCast<JSC::JSFunction*>(value);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.h (202177 => 202178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-06-17 20:21:17 UTC (rev 202177)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-06-17 20:51:11 UTC (rev 202178)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> class Node;
</span><span class="cx"> class SerializedScriptValue;
</span><span class="cx"> class Storage;
</span><ins>+class TouchList;
</ins><span class="cx"> class TrackBase;
</span><span class="cx"> class VoidCallback;
</span><span class="cx">
</span><span class="lines">@@ -165,6 +166,9 @@
</span><span class="cx"> static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<Gamepad>&);
</span><span class="cx"> #endif
</span><span class="cx"> static void convertValue(JSC::ExecState*, JSC::JSValue, JSC::JSFunction*&);
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(TOUCH_EVENTS)
+ static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<TouchList>&);
+#endif
</ins><span class="cx">
</span><span class="cx"> JSC::ExecState* m_exec;
</span><span class="cx"> JSC::Strong<JSC::JSObject> m_initializerObject;
</span></span></pre></div>
<a id="trunkSourceWebCoredomTouchEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TouchEvent.cpp (202177 => 202178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TouchEvent.cpp 2016-06-17 20:21:17 UTC (rev 202177)
+++ trunk/Source/WebCore/dom/TouchEvent.cpp 2016-06-17 20:51:11 UTC (rev 202178)
</span><span class="lines">@@ -55,6 +55,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TouchEvent::TouchEvent(const AtomicString& type, const TouchEventInit& initializer)
+ : MouseRelatedEvent(type, initializer)
+ , m_touches(initializer.touches ? initializer.touches : TouchList::create())
+ , m_targetTouches(initializer.targetTouches ? initializer.targetTouches : TouchList::create())
+ , m_changedTouches(initializer.changedTouches ? initializer.changedTouches : TouchList::create())
+{
+}
+
</ins><span class="cx"> TouchEvent::~TouchEvent()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomTouchEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TouchEvent.h (202177 => 202178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TouchEvent.h 2016-06-17 20:21:17 UTC (rev 202177)
+++ trunk/Source/WebCore/dom/TouchEvent.h 2016-06-17 20:51:11 UTC (rev 202178)
</span><span class="lines">@@ -36,6 +36,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+struct TouchEventInit : public MouseRelatedEventInit {
+ RefPtr<TouchList> touches;
+ RefPtr<TouchList> targetTouches;
+ RefPtr<TouchList> changedTouches;
+};
+
</ins><span class="cx"> class TouchEvent final : public MouseRelatedEvent {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~TouchEvent();
</span><span class="lines">@@ -54,6 +60,10 @@
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new TouchEvent);
</span><span class="cx"> }
</span><ins>+ static Ref<TouchEvent> createForBindings(const AtomicString& type, const TouchEventInit& initializer)
+ {
+ return adoptRef(*new TouchEvent(type, initializer));
+ }
</ins><span class="cx">
</span><span class="cx"> void initTouchEvent(TouchList* touches, TouchList* targetTouches,
</span><span class="cx"> TouchList* changedTouches, const AtomicString& type,
</span><span class="lines">@@ -80,6 +90,7 @@
</span><span class="cx"> AbstractView*, int screenX, int screenY, int pageX,
</span><span class="cx"> int pageY,
</span><span class="cx"> bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
</span><ins>+ TouchEvent(const AtomicString&, const TouchEventInit&);
</ins><span class="cx">
</span><span class="cx"> RefPtr<TouchList> m_touches;
</span><span class="cx"> RefPtr<TouchList> m_targetTouches;
</span></span></pre></div>
<a id="trunkSourceWebCoredomTouchEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TouchEvent.idl (202177 => 202178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TouchEvent.idl 2016-06-17 20:21:17 UTC (rev 202177)
+++ trunk/Source/WebCore/dom/TouchEvent.idl 2016-06-17 20:51:11 UTC (rev 202178)
</span><span class="lines">@@ -25,10 +25,11 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=TOUCH_EVENTS,
</span><ins>+ ConstructorTemplate=Event,
</ins><span class="cx"> ] interface TouchEvent : UIEvent {
</span><del>- readonly attribute TouchList touches;
- readonly attribute TouchList targetTouches;
- readonly attribute TouchList changedTouches;
</del><ins>+ [InitializedByEventConstructor] readonly attribute TouchList touches;
+ [InitializedByEventConstructor] readonly attribute TouchList targetTouches;
+ [InitializedByEventConstructor] readonly attribute TouchList changedTouches;
</ins><span class="cx"> readonly attribute boolean ctrlKey;
</span><span class="cx"> readonly attribute boolean shiftKey;
</span><span class="cx"> readonly attribute boolean altKey;
</span></span></pre>
</div>
</div>
</body>
</html>