<!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>[203707] 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/203707">203707</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-25 19:24:20 -0700 (Mon, 25 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Touch properties should be on the prototype
https://bugs.webkit.org/show_bug.cgi?id=160174
Reviewed by Ryosuke Niwa.
Source/WebCore:
Touch properties should be on the prototype:
- https://w3c.github.io/touch-events/#idl-def-touch
Chrome agrees with the specification.
Test: platform/ios-simulator/ios/touch/Touch-attributes-prototype.html
* bindings/scripts/CodeGeneratorJS.pm:
(InterfaceRequiresAttributesOnInstanceForCompatibility): Deleted.
LayoutTests:
Add layout test coverage.
* platform/ios-simulator/ios/touch/Touch-attributes-prototype-expected.txt: Added.
* platform/ios-simulator/ios/touch/Touch-attributes-prototype.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="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformiossimulatoriostouchTouchattributesprototypeexpectedtxt">trunk/LayoutTests/platform/ios-simulator/ios/touch/Touch-attributes-prototype-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriostouchTouchattributesprototypehtml">trunk/LayoutTests/platform/ios-simulator/ios/touch/Touch-attributes-prototype.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203706 => 203707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-26 02:18:30 UTC (rev 203706)
+++ trunk/LayoutTests/ChangeLog 2016-07-26 02:24:20 UTC (rev 203707)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-07-25 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Touch properties should be on the prototype
+ https://bugs.webkit.org/show_bug.cgi?id=160174
+
+ Reviewed by Ryosuke Niwa.
+
+ Add layout test coverage.
+
+ * platform/ios-simulator/ios/touch/Touch-attributes-prototype-expected.txt: Added.
+ * platform/ios-simulator/ios/touch/Touch-attributes-prototype.html: Added.
+
+2016-07-25 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> ClientRect properties should be on the prototype
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160165
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriostouchTouchattributesprototypeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/ios/touch/Touch-attributes-prototype-expected.txt (0 => 203707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/touch/Touch-attributes-prototype-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/ios/touch/Touch-attributes-prototype-expected.txt 2016-07-26 02:24:20 UTC (rev 203707)
</span><span class="lines">@@ -0,0 +1,101 @@
</span><ins>+Checks that Touch attributes are on the prototype.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS touch.__proto__ is Touch.prototype
+PASS Object.getOwnPropertyNames(touch).length is 0
+
+* touch.__proto__.identifier
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* Touch.prototype.identifier
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* touch.__proto__.target
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* Touch.prototype.target
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* touch.__proto__.screenX
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* Touch.prototype.screenX
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* touch.__proto__.screenY
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* Touch.prototype.screenY
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* touch.__proto__.clientX
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* Touch.prototype.clientX
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* touch.__proto__.clientY
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* Touch.prototype.clientY
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* touch.__proto__.pageX
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* Touch.prototype.pageX
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* touch.__proto__.pageY
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* Touch.prototype.pageY
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* touch.__proto__.force
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+
+* Touch.prototype.force
+PASS descriptor.get is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriostouchTouchattributesprototypehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/ios/touch/Touch-attributes-prototype.html (0 => 203707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/touch/Touch-attributes-prototype.html (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/ios/touch/Touch-attributes-prototype.html 2016-07-26 02:24:20 UTC (rev 203707)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../../../resources/js-test-pre.js"></script>
+<script>
+description("Checks that Touch attributes are on the prototype.");
+
+var touch = new Touch({ identifier: 1, target: document.body });
+shouldBe("touch.__proto__", "Touch.prototype");
+shouldBe("Object.getOwnPropertyNames(touch).length", "0");
+
+function checkAttributeGetter(prototype, propertyName)
+{
+ descriptor = Object.getOwnPropertyDescriptor(prototype, propertyName);
+ shouldBeType("descriptor.get", "Function");
+ shouldBeTrue("descriptor.enumerable");
+ shouldBeTrue("descriptor.configurable");
+}
+
+for (var propertyName of ["identifier", "target", "screenX", "screenY", "clientX", "clientY", "pageX", "pageY", "force"]) {
+ debug("");
+ debug("* touch.__proto__." + propertyName);
+ checkAttributeGetter(touch.__proto__, propertyName);
+
+ debug("");
+ debug("* Touch.prototype." + propertyName);
+ checkAttributeGetter(Touch.prototype, propertyName);
+}
+</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 (203706 => 203707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-26 02:18:30 UTC (rev 203706)
+++ trunk/Source/WebCore/ChangeLog 2016-07-26 02:24:20 UTC (rev 203707)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-07-25 Chris Dumez <cdumez@apple.com>
+
+ Touch properties should be on the prototype
+ https://bugs.webkit.org/show_bug.cgi?id=160174
+
+ Reviewed by Ryosuke Niwa.
+
+ Touch properties should be on the prototype:
+ - https://w3c.github.io/touch-events/#idl-def-touch
+
+ Chrome agrees with the specification.
+
+ Test: platform/ios-simulator/ios/touch/Touch-attributes-prototype.html
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (InterfaceRequiresAttributesOnInstanceForCompatibility): Deleted.
+
</ins><span class="cx"> 2016-07-25 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Set MediaRemote playback state based on MediaSession playback state.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (203706 => 203707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-07-26 02:18:30 UTC (rev 203706)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-07-26 02:24:20 UTC (rev 203707)
</span><span class="lines">@@ -533,18 +533,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-sub InterfaceRequiresAttributesOnInstanceForCompatibility
-{
- my $interface = shift;
- my $interfaceName = $interface->name;
-
- # Needed for compatibility with existing content
- return 1 if $interfaceName =~ "Touch";
-
- return 0;
-}
-
</del><span class="cx"> sub InterfaceRequiresAttributesOnInstance
</span><span class="cx"> {
</span><span class="cx"> my $interface = shift;
</span><span class="lines">@@ -560,8 +548,6 @@
</span><span class="cx"> # FIXME: Add support for [PrimaryGlobal] / [Global].
</span><span class="cx"> return 1 if IsDOMGlobalObject($interface) && $interface->name ne "WorkerGlobalScope";
</span><span class="cx">
</span><del>- return 1 if InterfaceRequiresAttributesOnInstanceForCompatibility($interface);
-
</del><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2573,16 +2559,6 @@
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!castedThis)) {\n");
</span><span class="cx"> if ($attribute->signature->extendedAttributes->{"LenientThis"}) {
</span><span class="cx"> push(@implContent, " return JSValue::encode(jsUndefined());\n");
</span><del>- } elsif (InterfaceRequiresAttributesOnInstanceForCompatibility($interface)) {
- # Fallback to trying to searching the prototype chain for compatibility reasons.
- push(@implContent, " JSObject* thisObject = JSValue::decode(thisValue).getObject();\n");
- push(@implContent, " for (thisObject = thisObject ? thisObject->getPrototypeDirect().getObject() : nullptr; thisObject; thisObject = thisObject->getPrototypeDirect().getObject()) {\n");
- push(@implContent, " if ((castedThis = " . GetCastingHelperForThisObject($interface) . "(thisObject)))\n");
- push(@implContent, " break;\n");
- push(@implContent, " }\n");
- push(@implContent, " if (!castedThis)\n");
- push(@implContent, " return throwGetterTypeError(*state, \"$interfaceName\", \"$name\");\n");
- push(@implContent, " reportDeprecatedGetterError(*state, \"$interfaceName\", \"$name\");\n");
</del><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " return throwGetterTypeError(*state, \"$interfaceName\", \"$name\");\n");
</span><span class="cx"> }
</span><span class="lines">@@ -2874,16 +2850,6 @@
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!castedThis)) {\n");
</span><span class="cx"> if ($attribute->signature->extendedAttributes->{"LenientThis"}) {
</span><span class="cx"> push(@implContent, " return false;\n");
</span><del>- } elsif (InterfaceRequiresAttributesOnInstanceForCompatibility($interface)) {
- # Fallback to trying to searching the prototype chain for compatibility reasons.
- push(@implContent, " JSObject* thisObject = JSValue::decode(thisValue).getObject();\n");
- push(@implContent, " for (thisObject = thisObject ? thisObject->getPrototypeDirect().getObject() : nullptr; thisObject; thisObject = thisObject->getPrototypeDirect().getObject()) {\n");
- push(@implContent, " if ((castedThis = " . GetCastingHelperForThisObject($interface) . "(thisObject)))\n");
- push(@implContent, " break;\n");
- push(@implContent, " }\n");
- push(@implContent, " if (!castedThis)\n");
- push(@implContent, " return throwSetterTypeError(*state, \"$interfaceName\", \"$name\");\n");
- push(@implContent, " reportDeprecatedSetterError(*state, \"$interfaceName\", \"$name\");\n");
</del><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " return throwSetterTypeError(*state, \"$interfaceName\", \"$name\");\n");
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>