<!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>[196145] 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/196145">196145</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-02-04 13:36:04 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Object.getOwnPropertyDescriptor() returns incomplete descriptor for instance properties
https://bugs.webkit.org/show_bug.cgi?id=153817
Reviewed by Geoffrey Garen.
LayoutTests/imported/w3c:
Rebaseline W3C HTML test now that more checks are passing. Some checks are still
failing because getter.call(undefined) / getter.call() currently throws an exception
for Window properties but shouldn't. Global object property getters should not require
an explicit |this|.
* web-platform-tests/html/dom/interfaces-expected.txt:
Source/JavaScriptCore:
Extend support for Object.getOwnPropertyDescriptor() on native bindings
to instance properties (e.g. Unforgeable properties or Global object
properties) so that the returned descriptor has getter / setter
functions, as expected.
* runtime/JSObject.cpp:
(JSC::JSObject::reifyAllStaticProperties):
Add method that reifies all static properties, including the custom
accessors. This is similar to what is done eagerly on the prototype
objects in the bindings code.
(JSC::JSObject::getOwnPropertyDescriptor):
getOwnPropertyDescriptor() would previously fails for custom accessors
that are on the instance because getDirect() does not check the static
property table and those custom accessors were not reified (We only
reified all properties eagerly - including custom accessors - on
prototype objects. To address this issue, we now call
reifyAllStaticProperties() if the call to getDirect() fails and then
call getDirect() again. This fix is however insufficient for Window
properties because |this| is a JSDOMWindowShell / JSProxy in this case
and getDirect() / reifyAllStaticProperties() would fail as the proxy
does not actually have the properties. This issue was addressed by
checking if |this| is a JSProxy and then using JSProxy::target() instead
of |this| for the calls to getDirect() and for the reification.
* runtime/JSObject.h:
* runtime/Lookup.h:
(JSC::reifyStaticProperty):
(JSC::reifyStaticProperties):
Move most code in reifyStaticProperties() to a separate function so the
code can be shared with JSObject::reifyAllStaticProperties().
reifyStaticProperties() is currently called by the bindings on the
prototype objects.
Source/WebCore:
Update the bindings generator so that property getters / setters now
make sure |this| has the right type and throw a TypeError if it does
not, as per:
- http://heycam.github.io/webidl/#dfn-attribute-getter (step 2.4.2)
- http://heycam.github.io/webidl/#dfn-attribute-setter (step 3.5)
This was an issue when doing something like:
Object.getOwnPropertyDescriptor(window, "location").get.call(nonWindow)
We would call toJSDOMWindow(thisValue), which would return null as
thisValue is not a JSDOMWindow. We would then dereference this null
pointer and crash. We now do a null check and throw a TypeError in
this case, as per the Web IDL specification.
The generated bindings still have some non-spec compliant behavior
though:
1. The getters / setters of instance properties use slotBase instead
of thisValue, which means that calling instanceA's getter on
instanceB returns instanceA's property insteas of instanceB's.
2. Global object property getters should not require an explicit
|this| so calling the following should work:
- Object.getOwnPropertyDescriptor(window, "location").get.call()
We currently throw in this case.
These issues will be addressed in follow-up patches.
Tests: js/getOwnPropertyDescriptor-unforgeable-attributes.html
js/getOwnPropertyDescriptor-window-attributes.html
js/instance-property-getter-other-instance.html
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
* bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
(WebCore::jsTestActiveDOMObjectExcitingAttr):
* bindings/scripts/test/JS/JSTestException.cpp:
(WebCore::jsTestExceptionName):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjConstructorTestSubObj):
(WebCore::jsTestObjTestSubObjEnabledBySettingConstructor):
(WebCore::jsTestObjConditionalAttr4Constructor):
(WebCore::jsTestObjConditionalAttr5Constructor):
(WebCore::jsTestObjConditionalAttr6Constructor):
(WebCore::jsTestObjContentDocument):
(WebCore::setJSTestObjTestSubObjEnabledBySettingConstructor):
(WebCore::setJSTestObjConditionalAttr4Constructor):
(WebCore::setJSTestObjConditionalAttr5Constructor):
(WebCore::setJSTestObjConditionalAttr6Constructor):
(WebCore::setJSTestObjConstructor): Deleted.
(WebCore::setJSTestObjConstructorStaticStringAttr): Deleted.
(WebCore::setJSTestObjConditionalAttr3): Deleted.
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
(WebCore::jsTestTypedefsConstructorTestSubObj):
LayoutTests:
Add layout test coverage for calling Object.getOwnPropertyDescriptor()
on instance properties (e.g. Unforgeable properties and Window properties).
* http/tests/security/cross-origin-window-property-access-expected.txt:
* http/tests/security/cross-origin-window-property-access.html:
- Fix bug causing the onload function to not find the crossOriginWindow variable.
- Update the case for accessing crossOriginWindow.location property as this is
actually expected to work as per the specification:
https://html.spec.whatwg.org/multipage/browsers.html#security-window
* js/dom/dom-as-prototype-assignment-exception-expected.txt:
* js/dom/getOwnPropertyDescriptor-expected.txt:
* js/dom/script-tests/dom-as-prototype-assignment-exception.js:
* js/getOwnPropertyDescriptor-unforgeable-attributes-expected.txt: Added.
* js/getOwnPropertyDescriptor-unforgeable-attributes.html: Added.
* js/getOwnPropertyDescriptor-window-attributes-expected.txt: Added.
* js/getOwnPropertyDescriptor-window-attributes.html: Added.
* js/instance-property-getter-other-instance-expected.txt: Added.
* js/instance-property-getter-other-instance.html: Added.
* js/resources/getOwnPropertyDescriptor.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginwindowpropertyaccessexpectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-window-property-access-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginwindowpropertyaccesshtml">trunk/LayoutTests/http/tests/security/cross-origin-window-property-access.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdomdomasprototypeassignmentexceptionexpectedtxt">trunk/LayoutTests/js/dom/dom-as-prototype-assignment-exception-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdomgetOwnPropertyDescriptorexpectedtxt">trunk/LayoutTests/js/dom/getOwnPropertyDescriptor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdomscripttestsdomasprototypeassignmentexceptionjs">trunk/LayoutTests/js/dom/script-tests/dom-as-prototype-assignment-exception.js</a></li>
<li><a href="#trunkLayoutTestsjsresourcesgetOwnPropertyDescriptorjs">trunk/LayoutTests/js/resources/getOwnPropertyDescriptor.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookuph">trunk/Source/JavaScriptCore/runtime/Lookup.h</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>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestExceptioncpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsgetOwnPropertyDescriptorunforgeableattributesexpectedtxt">trunk/LayoutTests/js/getOwnPropertyDescriptor-unforgeable-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsgetOwnPropertyDescriptorunforgeableattributeshtml">trunk/LayoutTests/js/getOwnPropertyDescriptor-unforgeable-attributes.html</a></li>
<li><a href="#trunkLayoutTestsjsgetOwnPropertyDescriptorwindowattributesexpectedtxt">trunk/LayoutTests/js/getOwnPropertyDescriptor-window-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsgetOwnPropertyDescriptorwindowattributeshtml">trunk/LayoutTests/js/getOwnPropertyDescriptor-window-attributes.html</a></li>
<li><a href="#trunkLayoutTestsjsinstancepropertygetterotherinstanceexpectedtxt">trunk/LayoutTests/js/instance-property-getter-other-instance-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsinstancepropertygetterotherinstancehtml">trunk/LayoutTests/js/instance-property-getter-other-instance.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/LayoutTests/ChangeLog 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-02-04 Chris Dumez <cdumez@apple.com>
+
+ Object.getOwnPropertyDescriptor() returns incomplete descriptor for instance properties
+ https://bugs.webkit.org/show_bug.cgi?id=153817
+
+ Reviewed by Geoffrey Garen.
+
+ Add layout test coverage for calling Object.getOwnPropertyDescriptor()
+ on instance properties (e.g. Unforgeable properties and Window properties).
+
+ * http/tests/security/cross-origin-window-property-access-expected.txt:
+ * http/tests/security/cross-origin-window-property-access.html:
+ - Fix bug causing the onload function to not find the crossOriginWindow variable.
+ - Update the case for accessing crossOriginWindow.location property as this is
+ actually expected to work as per the specification:
+ https://html.spec.whatwg.org/multipage/browsers.html#security-window
+
+ * js/dom/dom-as-prototype-assignment-exception-expected.txt:
+ * js/dom/getOwnPropertyDescriptor-expected.txt:
+ * js/dom/script-tests/dom-as-prototype-assignment-exception.js:
+ * js/getOwnPropertyDescriptor-unforgeable-attributes-expected.txt: Added.
+ * js/getOwnPropertyDescriptor-unforgeable-attributes.html: Added.
+ * js/getOwnPropertyDescriptor-window-attributes-expected.txt: Added.
+ * js/getOwnPropertyDescriptor-window-attributes.html: Added.
+ * js/instance-property-getter-other-instance-expected.txt: Added.
+ * js/instance-property-getter-other-instance.html: Added.
+ * js/resources/getOwnPropertyDescriptor.js:
+
</ins><span class="cx"> 2016-02-04 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking imported/w3c/web-platform-tests/html/semantics/document-metadata/styling/LinkStyle.html as flaky on Mac
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossoriginwindowpropertyaccessexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-window-property-access-expected.txt (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-window-property-access-expected.txt 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/LayoutTests/http/tests/security/cross-origin-window-property-access-expected.txt 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(window, "document").get.call(crossOriginWindow) threw exception TypeError: undefined is not an object (evaluating 'Object.getOwnPropertyDescriptor(window, "document").get.call').
</span><del>-PASS Object.getOwnPropertyDescriptor(window, "location").get.call(crossOriginWindow) threw exception TypeError: undefined is not an object (evaluating 'Object.getOwnPropertyDescriptor(window, "location").get.call').
</del><ins>+PASS Object.getOwnPropertyDescriptor(window, "location").get.call(crossOriginWindow) === crossOriginWindow.location is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossoriginwindowpropertyaccesshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-window-property-access.html (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-window-property-access.html 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/LayoutTests/http/tests/security/cross-origin-window-property-access.html 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -12,10 +12,10 @@
</span><span class="cx">
</span><span class="cx"> function runTest()
</span><span class="cx"> {
</span><del>- var crossOriginWindow = window.open("http://127.0.0.1:8000/security/resources/blank.html");
</del><ins>+ crossOriginWindow = window.open("http://127.0.0.1:8000/security/resources/blank.html");
</ins><span class="cx"> crossOriginWindow.onload = function() {
</span><span class="cx"> shouldThrow('Object.getOwnPropertyDescriptor(window, "document").get.call(crossOriginWindow)');
</span><del>- shouldThrow('Object.getOwnPropertyDescriptor(window, "location").get.call(crossOriginWindow)');
</del><ins>+ shouldBeTrue('Object.getOwnPropertyDescriptor(window, "location").get.call(crossOriginWindow) === crossOriginWindow.location')
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-04 Chris Dumez <cdumez@apple.com>
+
+ Object.getOwnPropertyDescriptor() returns incomplete descriptor for instance properties
+ https://bugs.webkit.org/show_bug.cgi?id=153817
+
+ Reviewed by Geoffrey Garen.
+
+ Rebaseline W3C HTML test now that more checks are passing. Some checks are still
+ failing because getter.call(undefined) / getter.call() currently throws an exception
+ for Window properties but shouldn't. Global object property getters should not require
+ an explicit |this|.
+
+ * web-platform-tests/html/dom/interfaces-expected.txt:
+
</ins><span class="cx"> 2016-02-04 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Add support for iterating over Headers
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> FAIL Document interface: iframe.contentDocument must inherit property "styleSheetSets" with the proper type (32) assert_inherits: property "styleSheetSets" not found in prototype chain
</span><span class="cx"> FAIL Document interface: iframe.contentDocument must inherit property "enableStyleSheetsForSet" with the proper type (33) assert_inherits: property "enableStyleSheetsForSet" not found in prototype chain
</span><span class="cx"> FAIL Document interface: calling enableStyleSheetsForSet(DOMString) on iframe.contentDocument with too few arguments must throw TypeError assert_inherits: property "enableStyleSheetsForSet" not found in prototype chain
</span><del>-FAIL Document interface: iframe.contentDocument must have own property "location" assert_equals: getter must be Function expected "function" but got "undefined"
</del><ins>+PASS Document interface: iframe.contentDocument must have own property "location"
</ins><span class="cx"> PASS Document interface: iframe.contentDocument must inherit property "domain" with the proper type (35)
</span><span class="cx"> PASS Document interface: iframe.contentDocument must inherit property "referrer" with the proper type (36)
</span><span class="cx"> PASS Document interface: iframe.contentDocument must inherit property "cookie" with the proper type (37)
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> FAIL Document interface: document.implementation.createDocument(null, "", null) must inherit property "styleSheetSets" with the proper type (32) assert_inherits: property "styleSheetSets" not found in prototype chain
</span><span class="cx"> FAIL Document interface: document.implementation.createDocument(null, "", null) must inherit property "enableStyleSheetsForSet" with the proper type (33) assert_inherits: property "enableStyleSheetsForSet" not found in prototype chain
</span><span class="cx"> FAIL Document interface: calling enableStyleSheetsForSet(DOMString) on document.implementation.createDocument(null, "", null) with too few arguments must throw TypeError assert_inherits: property "enableStyleSheetsForSet" not found in prototype chain
</span><del>-FAIL Document interface: document.implementation.createDocument(null, "", null) must have own property "location" assert_equals: getter must be Function expected "function" but got "undefined"
</del><ins>+PASS Document interface: document.implementation.createDocument(null, "", null) must have own property "location"
</ins><span class="cx"> PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "domain" with the proper type (35)
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "referrer" with the proper type (36)
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "cookie" with the proper type (37)
</span><span class="lines">@@ -3800,30 +3800,30 @@
</span><span class="cx"> PASS Window interface object name
</span><span class="cx"> FAIL Window interface: existence and properties of interface prototype object assert_equals: Class name for prototype of Window.prototype is not "WindowProperties" expected "[object WindowProperties]" but got "[object Object]"
</span><span class="cx"> FAIL Window interface: existence and properties of interface prototype object's "constructor" property assert_own_property: Window.prototype does not have own property "constructor" expected property "constructor" missing
</span><del>-FAIL Window interface: attribute self assert_equals: "self" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute name assert_equals: "name" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute history assert_equals: "history" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute locationbar assert_equals: "locationbar" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute menubar assert_equals: "menubar" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute personalbar assert_equals: "personalbar" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute scrollbars assert_equals: "scrollbars" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute statusbar assert_equals: "statusbar" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute toolbar assert_equals: "toolbar" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute status assert_equals: "status" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute self The DOMWindow.self getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute name The DOMWindow.name getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute history The DOMWindow.history getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute locationbar The DOMWindow.locationbar getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute menubar The DOMWindow.menubar getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute personalbar The DOMWindow.personalbar getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute scrollbars The DOMWindow.scrollbars getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute statusbar The DOMWindow.statusbar getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute toolbar The DOMWindow.toolbar getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute status The DOMWindow.status getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: operation close() assert_equals: property should be writable if and only if not unforgeable expected true but got false
</span><del>-FAIL Window interface: attribute closed assert_equals: "closed" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute closed The DOMWindow.closed getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: operation stop() desc is not an Object. (evaluating '"get" in desc')
</span><span class="cx"> FAIL Window interface: operation focus() assert_equals: property should be writable if and only if not unforgeable expected true but got false
</span><span class="cx"> FAIL Window interface: operation blur() assert_equals: property should be writable if and only if not unforgeable expected true but got false
</span><del>-FAIL Window interface: attribute frames assert_equals: "frames" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute length assert_equals: "length" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute opener assert_equals: "opener" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute parent assert_equals: "parent" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute frameElement assert_equals: "frameElement" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute frames The DOMWindow.frames getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute length The DOMWindow.length getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute opener The DOMWindow.opener getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute parent The DOMWindow.parent getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute frameElement The DOMWindow.frameElement getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: operation open(DOMString,DOMString,DOMString,boolean) desc is not an Object. (evaluating '"get" in desc')
</span><del>-FAIL Window interface: attribute navigator assert_equals: "navigator" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute navigator The DOMWindow.navigator getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: attribute external assert_own_property: The global object must have a property "external" expected property "external" missing
</span><del>-FAIL Window interface: attribute applicationCache assert_equals: "applicationCache" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute applicationCache The DOMWindow.applicationCache getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: operation alert() desc is not an Object. (evaluating '"get" in desc')
</span><span class="cx"> FAIL Window interface: operation confirm(DOMString) desc is not an Object. (evaluating '"get" in desc')
</span><span class="cx"> FAIL Window interface: operation prompt(DOMString,DOMString) desc is not an Object. (evaluating '"get" in desc')
</span><span class="lines">@@ -3832,82 +3832,82 @@
</span><span class="cx"> FAIL Window interface: operation postMessage(any,DOMString,[object Object]) assert_equals: property should be writable if and only if not unforgeable expected true but got false
</span><span class="cx"> FAIL Window interface: operation captureEvents() desc is not an Object. (evaluating '"get" in desc')
</span><span class="cx"> FAIL Window interface: operation releaseEvents() desc is not an Object. (evaluating '"get" in desc')
</span><del>-FAIL Window interface: attribute onabort assert_equals: "onabort" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute onabort The DOMWindow.onabort getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: attribute onautocomplete assert_own_property: The global object must have a property "onautocomplete" expected property "onautocomplete" missing
</span><span class="cx"> FAIL Window interface: attribute onautocompleteerror assert_own_property: The global object must have a property "onautocompleteerror" expected property "onautocompleteerror" missing
</span><del>-FAIL Window interface: attribute onblur assert_equals: "onblur" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute onblur The DOMWindow.onblur getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: attribute oncancel assert_own_property: The global object must have a property "oncancel" expected property "oncancel" missing
</span><del>-FAIL Window interface: attribute oncanplay assert_equals: "oncanplay" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute oncanplaythrough assert_equals: "oncanplaythrough" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onchange assert_equals: "onchange" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onclick assert_equals: "onclick" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute oncanplay The DOMWindow.oncanplay getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute oncanplaythrough The DOMWindow.oncanplaythrough getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onchange The DOMWindow.onchange getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onclick The DOMWindow.onclick getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: attribute onclose assert_own_property: The global object must have a property "onclose" expected property "onclose" missing
</span><del>-FAIL Window interface: attribute oncontextmenu assert_equals: "oncontextmenu" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute oncontextmenu The DOMWindow.oncontextmenu getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: attribute oncuechange assert_own_property: The global object must have a property "oncuechange" expected property "oncuechange" missing
</span><del>-FAIL Window interface: attribute ondblclick assert_equals: "ondblclick" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute ondrag assert_equals: "ondrag" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute ondragend assert_equals: "ondragend" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute ondragenter assert_equals: "ondragenter" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute ondblclick The DOMWindow.ondblclick getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute ondrag The DOMWindow.ondrag getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute ondragend The DOMWindow.ondragend getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute ondragenter The DOMWindow.ondragenter getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: attribute ondragexit assert_own_property: The global object must have a property "ondragexit" expected property "ondragexit" missing
</span><del>-FAIL Window interface: attribute ondragleave assert_equals: "ondragleave" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute ondragover assert_equals: "ondragover" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute ondragstart assert_equals: "ondragstart" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute ondrop assert_equals: "ondrop" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute ondurationchange assert_equals: "ondurationchange" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onemptied assert_equals: "onemptied" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onended assert_equals: "onended" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onerror assert_equals: "onerror" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onfocus assert_equals: "onfocus" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute oninput assert_equals: "oninput" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute oninvalid assert_equals: "oninvalid" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onkeydown assert_equals: "onkeydown" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onkeypress assert_equals: "onkeypress" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onkeyup assert_equals: "onkeyup" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onload assert_equals: "onload" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onloadeddata assert_equals: "onloadeddata" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onloadedmetadata assert_equals: "onloadedmetadata" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onloadstart assert_equals: "onloadstart" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onmousedown assert_equals: "onmousedown" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onmouseenter assert_equals: "onmouseenter" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onmouseleave assert_equals: "onmouseleave" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onmousemove assert_equals: "onmousemove" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onmouseout assert_equals: "onmouseout" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onmouseover assert_equals: "onmouseover" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onmouseup assert_equals: "onmouseup" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onmousewheel assert_equals: "onmousewheel" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onpause assert_equals: "onpause" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onplay assert_equals: "onplay" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onplaying assert_equals: "onplaying" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onprogress assert_equals: "onprogress" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onratechange assert_equals: "onratechange" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onreset assert_equals: "onreset" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onresize assert_equals: "onresize" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onscroll assert_equals: "onscroll" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onseeked assert_equals: "onseeked" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onseeking assert_equals: "onseeking" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onselect assert_equals: "onselect" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute ondragleave The DOMWindow.ondragleave getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute ondragover The DOMWindow.ondragover getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute ondragstart The DOMWindow.ondragstart getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute ondrop The DOMWindow.ondrop getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute ondurationchange The DOMWindow.ondurationchange getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onemptied The DOMWindow.onemptied getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onended The DOMWindow.onended getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onerror The DOMWindow.onerror getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onfocus The DOMWindow.onfocus getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute oninput The DOMWindow.oninput getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute oninvalid The DOMWindow.oninvalid getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onkeydown The DOMWindow.onkeydown getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onkeypress The DOMWindow.onkeypress getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onkeyup The DOMWindow.onkeyup getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onload The DOMWindow.onload getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onloadeddata The DOMWindow.onloadeddata getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onloadedmetadata The DOMWindow.onloadedmetadata getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onloadstart The DOMWindow.onloadstart getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onmousedown The DOMWindow.onmousedown getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onmouseenter assert_equals: Gets on a global should not require an explicit this expected (undefined) undefined but got (object) null
+FAIL Window interface: attribute onmouseleave assert_equals: Gets on a global should not require an explicit this expected (undefined) undefined but got (object) null
+FAIL Window interface: attribute onmousemove The DOMWindow.onmousemove getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onmouseout The DOMWindow.onmouseout getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onmouseover The DOMWindow.onmouseover getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onmouseup The DOMWindow.onmouseup getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onmousewheel The DOMWindow.onmousewheel getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onpause The DOMWindow.onpause getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onplay The DOMWindow.onplay getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onplaying The DOMWindow.onplaying getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onprogress The DOMWindow.onprogress getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onratechange The DOMWindow.onratechange getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onreset The DOMWindow.onreset getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onresize The DOMWindow.onresize getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onscroll The DOMWindow.onscroll getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onseeked The DOMWindow.onseeked getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onseeking The DOMWindow.onseeking getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onselect The DOMWindow.onselect getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: attribute onshow assert_own_property: The global object must have a property "onshow" expected property "onshow" missing
</span><span class="cx"> FAIL Window interface: attribute onsort assert_own_property: The global object must have a property "onsort" expected property "onsort" missing
</span><del>-FAIL Window interface: attribute onstalled assert_equals: "onstalled" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onsubmit assert_equals: "onsubmit" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onsuspend assert_equals: "onsuspend" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute ontimeupdate assert_equals: "ontimeupdate" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute onstalled The DOMWindow.onstalled getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onsubmit The DOMWindow.onsubmit getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onsuspend The DOMWindow.onsuspend getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute ontimeupdate The DOMWindow.ontimeupdate getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: attribute ontoggle assert_own_property: The global object must have a property "ontoggle" expected property "ontoggle" missing
</span><del>-FAIL Window interface: attribute onvolumechange assert_equals: "onvolumechange" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onwaiting assert_equals: "onwaiting" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute onvolumechange The DOMWindow.onvolumechange getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onwaiting The DOMWindow.onwaiting getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: attribute onafterprint assert_own_property: The global object must have a property "onafterprint" expected property "onafterprint" missing
</span><span class="cx"> FAIL Window interface: attribute onbeforeprint assert_own_property: The global object must have a property "onbeforeprint" expected property "onbeforeprint" missing
</span><del>-FAIL Window interface: attribute onbeforeunload assert_equals: "onbeforeunload" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onhashchange assert_equals: "onhashchange" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute onbeforeunload The DOMWindow.onbeforeunload getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onhashchange The DOMWindow.onhashchange getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: attribute onlanguagechange assert_own_property: The global object must have a property "onlanguagechange" expected property "onlanguagechange" missing
</span><del>-FAIL Window interface: attribute onmessage assert_equals: "onmessage" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onoffline assert_equals: "onoffline" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute ononline assert_equals: "ononline" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onpagehide assert_equals: "onpagehide" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onpageshow assert_equals: "onpageshow" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onpopstate assert_equals: "onpopstate" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onstorage assert_equals: "onstorage" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute onunload assert_equals: "onunload" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute onmessage The DOMWindow.onmessage getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onoffline The DOMWindow.onoffline getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute ononline The DOMWindow.ononline getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onpagehide The DOMWindow.onpagehide getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onpageshow The DOMWindow.onpageshow getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onpopstate The DOMWindow.onpopstate getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onstorage The DOMWindow.onstorage getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute onunload The DOMWindow.onunload getter can only be used on instances of DOMWindow
</ins><span class="cx"> FAIL Window interface: operation btoa(DOMString) desc is not an Object. (evaluating '"get" in desc')
</span><span class="cx"> FAIL Window interface: operation atob(DOMString) desc is not an Object. (evaluating '"get" in desc')
</span><span class="cx"> FAIL Window interface: operation setTimeout(Function,long,any) desc is not an Object. (evaluating '"get" in desc')
</span><span class="lines">@@ -3917,15 +3917,15 @@
</span><span class="cx"> FAIL Window interface: operation setInterval(DOMString,long,any) desc is not an Object. (evaluating '"get" in desc')
</span><span class="cx"> FAIL Window interface: operation clearInterval(long) desc is not an Object. (evaluating '"get" in desc')
</span><span class="cx"> FAIL Window interface: operation createImageBitmap(ImageBitmapSource,long,long,long,long) assert_own_property: global object missing non-static operation expected property "createImageBitmap" missing
</span><del>-FAIL Window interface: attribute sessionStorage assert_equals: "sessionStorage" must have a getter expected "function" but got "undefined"
-FAIL Window interface: attribute localStorage assert_equals: "localStorage" must have a getter expected "function" but got "undefined"
</del><ins>+FAIL Window interface: attribute sessionStorage The DOMWindow.sessionStorage getter can only be used on instances of DOMWindow
+FAIL Window interface: attribute localStorage The DOMWindow.localStorage getter can only be used on instances of DOMWindow
</ins><span class="cx"> PASS Window must be primary interface of window
</span><span class="cx"> PASS Stringification of window
</span><del>-FAIL Window interface: window must have own property "window" assert_false: property descriptor has value but is supposed to be accessor expected false got true
</del><ins>+PASS Window interface: window must have own property "window"
</ins><span class="cx"> PASS Window interface: window must inherit property "self" with the proper type (1)
</span><del>-FAIL Window interface: window must have own property "document" assert_false: property descriptor has value but is supposed to be accessor expected false got true
</del><ins>+PASS Window interface: window must have own property "document"
</ins><span class="cx"> PASS Window interface: window must inherit property "name" with the proper type (3)
</span><del>-FAIL Window interface: window must have own property "location" assert_equals: getter must be Function expected "function" but got "undefined"
</del><ins>+PASS Window interface: window must have own property "location"
</ins><span class="cx"> PASS Window interface: window must inherit property "history" with the proper type (5)
</span><span class="cx"> PASS Window interface: window must inherit property "locationbar" with the proper type (6)
</span><span class="cx"> PASS Window interface: window must inherit property "menubar" with the proper type (7)
</span><span class="lines">@@ -3941,7 +3941,7 @@
</span><span class="cx"> PASS Window interface: window must inherit property "blur" with the proper type (17)
</span><span class="cx"> PASS Window interface: window must inherit property "frames" with the proper type (18)
</span><span class="cx"> PASS Window interface: window must inherit property "length" with the proper type (19)
</span><del>-FAIL Window interface: window must have own property "top" assert_equals: getter must be Function expected "function" but got "undefined"
</del><ins>+PASS Window interface: window must have own property "top"
</ins><span class="cx"> PASS Window interface: window must inherit property "opener" with the proper type (21)
</span><span class="cx"> PASS Window interface: window must inherit property "parent" with the proper type (22)
</span><span class="cx"> PASS Window interface: window must inherit property "frameElement" with the proper type (23)
</span><span class="lines">@@ -4117,21 +4117,21 @@
</span><span class="cx"> PASS Location interface: existence and properties of interface prototype object's "constructor" property
</span><span class="cx"> PASS Location must be primary interface of window.location
</span><span class="cx"> PASS Stringification of window.location
</span><del>-FAIL Location interface: window.location must have own property "href" assert_equals: getter must be Function expected "function" but got "undefined"
-FAIL Location interface: window.location must have own property "origin" assert_equals: getter must be Function expected "function" but got "undefined"
-FAIL Location interface: window.location must have own property "protocol" assert_equals: getter must be Function expected "function" but got "undefined"
-FAIL Location interface: window.location must have own property "host" assert_equals: getter must be Function expected "function" but got "undefined"
-FAIL Location interface: window.location must have own property "hostname" assert_equals: getter must be Function expected "function" but got "undefined"
-FAIL Location interface: window.location must have own property "port" assert_equals: getter must be Function expected "function" but got "undefined"
-FAIL Location interface: window.location must have own property "pathname" assert_equals: getter must be Function expected "function" but got "undefined"
-FAIL Location interface: window.location must have own property "search" assert_equals: getter must be Function expected "function" but got "undefined"
-FAIL Location interface: window.location must have own property "hash" assert_equals: getter must be Function expected "function" but got "undefined"
</del><ins>+PASS Location interface: window.location must have own property "href"
+FAIL Location interface: window.location must have own property "origin" assert_equals: setter must be function for PutForwards, Replaceable, or non-readonly attributes expected "function" but got "undefined"
+PASS Location interface: window.location must have own property "protocol"
+PASS Location interface: window.location must have own property "host"
+PASS Location interface: window.location must have own property "hostname"
+PASS Location interface: window.location must have own property "port"
+PASS Location interface: window.location must have own property "pathname"
+PASS Location interface: window.location must have own property "search"
+PASS Location interface: window.location must have own property "hash"
</ins><span class="cx"> FAIL Location interface: window.location must have own property "assign" assert_own_property: Doesn't have the unforgeable operation property expected property "assign" missing
</span><span class="cx"> FAIL Location interface: calling assign(USVString) on window.location with too few arguments must throw TypeError assert_own_property: expected property "assign" missing
</span><span class="cx"> FAIL Location interface: window.location must have own property "replace" assert_own_property: Doesn't have the unforgeable operation property expected property "replace" missing
</span><span class="cx"> FAIL Location interface: calling replace(USVString) on window.location with too few arguments must throw TypeError assert_own_property: expected property "replace" missing
</span><span class="cx"> FAIL Location interface: window.location must have own property "reload" assert_own_property: Doesn't have the unforgeable operation property expected property "reload" missing
</span><del>-FAIL Location interface: window.location must have own property "ancestorOrigins" assert_equals: getter must be Function expected "function" but got "undefined"
</del><ins>+PASS Location interface: window.location must have own property "ancestorOrigins"
</ins><span class="cx"> FAIL PopStateEvent interface: existence and properties of interface object assert_equals: class string of PopStateEvent expected "[object Function]" but got "[object PopStateEventConstructor]"
</span><span class="cx"> PASS PopStateEvent interface object length
</span><span class="cx"> PASS PopStateEvent interface object name
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomdomasprototypeassignmentexceptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/dom-as-prototype-assignment-exception-expected.txt (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/dom-as-prototype-assignment-exception-expected.txt 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/LayoutTests/js/dom/dom-as-prototype-assignment-exception-expected.txt 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> PASS testObject.id threw exception TypeError: The Element.id getter can only be used on instances of Element.
</span><span class="cx"> PASS testObject.id="foo" threw exception TypeError: The Element.id setter can only be used on instances of Element.
</span><del>-PASS testObject.length is 1
</del><ins>+PASS testObject.length threw exception TypeError: The HTMLCollection.length getter can only be used on instances of HTMLCollection.
</ins><span class="cx"> PASS div.id is 'test'
</span><span class="cx"> PASS div.hasOwnProperty('id') is false
</span><span class="cx"> PASS div.__proto__.id threw exception TypeError: The Element.id getter can only be used on instances of Element.
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomgetOwnPropertyDescriptorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/getOwnPropertyDescriptor-expected.txt (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/getOwnPropertyDescriptor-expected.txt 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/LayoutTests/js/dom/getOwnPropertyDescriptor-expected.txt 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -124,23 +124,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'length').get is undefined
-PASS Object.getOwnPropertyDescriptor(global, 'length').set is undefined
-PASS Object.getOwnPropertyDescriptor(global, 'length').hasOwnProperty('value') is false
-PASS Object.getOwnPropertyDescriptor(global, 'length').hasOwnProperty('writable') is false
-PASS Object.getOwnPropertyDescriptor(global, 'length').enumerable is true
-PASS Object.getOwnPropertyDescriptor(global, 'length').configurable is false
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 0).value is global[0]
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 0).hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 0).hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 0).enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 0).configurable is false
</span><del>-PASS Object.getOwnPropertyDescriptor(document.getElementsByTagName('div'), 'length').get is undefined
-PASS Object.getOwnPropertyDescriptor(document.getElementsByTagName('div'), 'length').set is undefined
-PASS Object.getOwnPropertyDescriptor(document.getElementsByTagName('div'), 'length').hasOwnProperty('value') is false
-PASS Object.getOwnPropertyDescriptor(document.getElementsByTagName('div'), 'length').hasOwnProperty('writable') is false
-PASS Object.getOwnPropertyDescriptor(document.getElementsByTagName('div'), 'length').enumerable is true
-PASS Object.getOwnPropertyDescriptor(document.getElementsByTagName('div'), 'length').configurable is false
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(document.getElementsByTagName('div'), 0).value is document.getElementsByTagName('div')[0]
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(document.getElementsByTagName('div'), 0).hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(document.getElementsByTagName('div'), 0).hasOwnProperty('set') is false
</span><span class="lines">@@ -151,23 +139,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(document.getElementsByClassName('pass'), 0).hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(document.getElementsByClassName('pass'), 0).enumerable is true
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(document.getElementsByClassName('pass'), 0).configurable is false
</span><del>-PASS Object.getOwnPropertyDescriptor(document.getElementsByClassName('pass'), 'length').get is undefined
-PASS Object.getOwnPropertyDescriptor(document.getElementsByClassName('pass'), 'length').set is undefined
-PASS Object.getOwnPropertyDescriptor(document.getElementsByClassName('pass'), 'length').hasOwnProperty('value') is false
-PASS Object.getOwnPropertyDescriptor(document.getElementsByClassName('pass'), 'length').hasOwnProperty('writable') is false
-PASS Object.getOwnPropertyDescriptor(document.getElementsByClassName('pass'), 'length').enumerable is true
-PASS Object.getOwnPropertyDescriptor(document.getElementsByClassName('pass'), 'length').configurable is false
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(canvasPixelArray, 0).value is canvasPixelArray[0]
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(canvasPixelArray, 0).hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(canvasPixelArray, 0).hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(canvasPixelArray, 0).enumerable is true
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(canvasPixelArray, 0).configurable is false
</span><del>-PASS Object.getOwnPropertyDescriptor(select, 'length').get is undefined
-PASS Object.getOwnPropertyDescriptor(select, 'length').set is undefined
-PASS Object.getOwnPropertyDescriptor(select, 'length').hasOwnProperty('value') is false
-PASS Object.getOwnPropertyDescriptor(select, 'length').hasOwnProperty('writable') is false
-PASS Object.getOwnPropertyDescriptor(select, 'length').enumerable is true
-PASS Object.getOwnPropertyDescriptor(select, 'length').configurable is false
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(select, 0).value is select[0]
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(select, 0).hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(select, 0).hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomscripttestsdomasprototypeassignmentexceptionjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/script-tests/dom-as-prototype-assignment-exception.js (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/script-tests/dom-as-prototype-assignment-exception.js 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/LayoutTests/js/dom/script-tests/dom-as-prototype-assignment-exception.js 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> shouldThrow('testObject.id="foo"')
</span><span class="cx">
</span><span class="cx"> testObject = {__proto__: document.getElementsByTagName("div")}
</span><del>-shouldBe("testObject.length", '1')
</del><ins>+shouldThrow("testObject.length")
</ins><span class="cx">
</span><span class="cx"> shouldBe("div.id", "'test'")
</span><span class="cx"> shouldBeFalse("div.hasOwnProperty('id')")
</span></span></pre></div>
<a id="trunkLayoutTestsjsgetOwnPropertyDescriptorunforgeableattributesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/getOwnPropertyDescriptor-unforgeable-attributes-expected.txt (0 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/getOwnPropertyDescriptor-unforgeable-attributes-expected.txt (rev 0)
+++ trunk/LayoutTests/js/getOwnPropertyDescriptor-unforgeable-attributes-expected.txt 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -0,0 +1,134 @@
</span><ins>+Tests that Object.getOwnPropertyDescriptor() works correctly for [Unforgeable] IDL attributes.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+* Document.location
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Document.location getter can only be used on instances of Document.
+PASS descriptor.get.call(document) is document.location
+
+* Location.href
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Location.href getter can only be used on instances of Location.
+PASS descriptor.get.call(document.location) === document.location.href is true
+
+* Location.protocol
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Location.protocol getter can only be used on instances of Location.
+PASS descriptor.get.call(document.location) === document.location.protocol is true
+
+* Location.host
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Location.host getter can only be used on instances of Location.
+PASS descriptor.get.call(document.location) === document.location.host is true
+
+* Location.hostname
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Location.hostname getter can only be used on instances of Location.
+PASS descriptor.get.call(document.location) === document.location.hostname is true
+
+* Location.port
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Location.port getter can only be used on instances of Location.
+PASS descriptor.get.call(document.location) === document.location.port is true
+
+* Location.pathname
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Location.pathname getter can only be used on instances of Location.
+PASS descriptor.get.call(document.location) === document.location.pathname is true
+
+* Location.search
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Location.search getter can only be used on instances of Location.
+PASS descriptor.get.call(document.location) === document.location.search is true
+
+* Location.hash
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Location.hash getter can only be used on instances of Location.
+PASS descriptor.get.call(document.location) === document.location.hash is true
+
+* Location.origin
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is undefined.
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Location.origin getter can only be used on instances of Location.
+PASS descriptor.get.call(document.location) === document.location.origin is true
+
+* Location.ancestorOrigins
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is undefined.
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The Location.ancestorOrigins getter can only be used on instances of Location.
+
+* Window.location
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The DOMWindow.location getter can only be used on instances of DOMWindow.
+PASS descriptor.get.call(window) === window.location is true
+
+* Window.self
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The DOMWindow.self getter can only be used on instances of DOMWindow.
+PASS descriptor.get.call(window) === window.self is true
+
+* Window.window
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is undefined.
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The DOMWindow.window getter can only be used on instances of DOMWindow.
+PASS descriptor.get.call(window) === window.window is true
+
+* Window.top
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is undefined.
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The DOMWindow.top getter can only be used on instances of DOMWindow.
+PASS descriptor.get.call(window) === window.top is true
+
+* Window.document
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is undefined.
+PASS descriptor.enumerable is true
+PASS descriptor.configurable is false
+PASS descriptor.get.call(invalidObject) threw exception TypeError: The DOMWindow.document getter can only be used on instances of DOMWindow.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsgetOwnPropertyDescriptorunforgeableattributeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/getOwnPropertyDescriptor-unforgeable-attributes.html (0 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/getOwnPropertyDescriptor-unforgeable-attributes.html (rev 0)
+++ trunk/LayoutTests/js/getOwnPropertyDescriptor-unforgeable-attributes.html 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+<!DOCTYPE html>
+<script src="../resources/js-test-pre.js"></script>
+<script>
+description("Tests that Object.getOwnPropertyDescriptor() works correctly for [Unforgeable] IDL attributes.");
+
+function checkUnforgeablePropertyDescriptor(descriptor, readOnly)
+{
+ shouldBeType("descriptor.get", "Function");
+ if (readOnly)
+ shouldBeUndefined("descriptor.set");
+ else
+ shouldBeType("descriptor.set", "Function");
+ shouldBeTrue("descriptor.enumerable");
+ shouldBeFalse("descriptor.configurable");
+ invalidObject = { };
+ shouldThrow("descriptor.get.call(invalidObject)");
+}
+
+debug("* Document.location");
+descriptor = Object.getOwnPropertyDescriptor(document, "location");
+checkUnforgeablePropertyDescriptor(descriptor);
+shouldBe("descriptor.get.call(document)", "document.location");
+
+var locationProperties = Object.getOwnPropertyNames(document.location);
+for (var i = 0; i < locationProperties.length; i++) {
+ var propertyName = locationProperties[i];
+ descriptor = Object.getOwnPropertyDescriptor(document.location, propertyName);
+ if (descriptor.value)
+ continue;
+
+ debug("");
+ debug("* Location." + propertyName);
+ var isReadOnly = propertyName == "origin" || propertyName == "ancestorOrigins";
+ checkUnforgeablePropertyDescriptor(descriptor, isReadOnly);
+ if (propertyName != "ancestorOrigins")
+ shouldBeTrue("descriptor.get.call(document.location) === document.location." + propertyName);
+}
+
+debug("");
+debug("* Window.location");
+descriptor = Object.getOwnPropertyDescriptor(window, "location");
+checkUnforgeablePropertyDescriptor(descriptor);
+shouldBeTrue("descriptor.get.call(window) === window.location");
+
+debug("");
+debug("* Window.self");
+descriptor = Object.getOwnPropertyDescriptor(window, "self");
+checkUnforgeablePropertyDescriptor(descriptor);
+shouldBeTrue("descriptor.get.call(window) === window.self");
+
+debug("");
+debug("* Window.window");
+descriptor = Object.getOwnPropertyDescriptor(window, "window");
+checkUnforgeablePropertyDescriptor(descriptor, true);
+shouldBeTrue("descriptor.get.call(window) === window.window");
+
+debug("");
+debug("* Window.top");
+descriptor = Object.getOwnPropertyDescriptor(window, "top");
+checkUnforgeablePropertyDescriptor(descriptor, true);
+shouldBeTrue("descriptor.get.call(window) === window.top");
+
+debug("");
+debug("* Window.document");
+descriptor = Object.getOwnPropertyDescriptor(window, "document");
+checkUnforgeablePropertyDescriptor(descriptor, true);
+
+</script>
+<script src="../resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsgetOwnPropertyDescriptorwindowattributesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/getOwnPropertyDescriptor-window-attributes-expected.txt (0 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/getOwnPropertyDescriptor-window-attributes-expected.txt (rev 0)
+++ trunk/LayoutTests/js/getOwnPropertyDescriptor-window-attributes-expected.txt 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+Tests that Object.getOwnPropertyDescriptor() works correctly for Window properties
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+* Window.screen
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+FAIL descriptor.configurable should be true. Was false.
+PASS descriptor.get.call(nonWindowObject) threw exception TypeError: The DOMWindow.screen getter can only be used on instances of DOMWindow.
+PASS descriptor.get.call(window) === window.screen is true
+FAIL descriptor.get.call() === window.screen should be true. Threw exception TypeError: The DOMWindow.screen getter can only be used on instances of DOMWindow
+
+* Window.navigator
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+FAIL descriptor.configurable should be true. Was false.
+PASS descriptor.get.call(nonWindowObject) threw exception TypeError: The DOMWindow.navigator getter can only be used on instances of DOMWindow.
+PASS descriptor.get.call(window) === window.navigator is true
+FAIL descriptor.get.call() === window.navigator should be true. Threw exception TypeError: The DOMWindow.navigator getter can only be used on instances of DOMWindow
+
+* Window.frameElement
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is undefined.
+PASS descriptor.enumerable is true
+FAIL descriptor.configurable should be true. Was false.
+PASS descriptor.get.call(nonWindowObject) threw exception TypeError: The DOMWindow.frameElement getter can only be used on instances of DOMWindow.
+PASS descriptor.get.call(window) === window.frameElement is true
+FAIL descriptor.get.call() === window.frameElement should be true. Threw exception TypeError: The DOMWindow.frameElement getter can only be used on instances of DOMWindow
+
+* Window.name
+PASS descriptor.get is an instance of Function
+PASS descriptor.set is an instance of Function
+PASS descriptor.enumerable is true
+FAIL descriptor.configurable should be true. Was false.
+PASS descriptor.get.call(nonWindowObject) threw exception TypeError: The DOMWindow.name getter can only be used on instances of DOMWindow.
+PASS descriptor.get.call(window) === window.name is true
+FAIL descriptor.get.call() === window.name should be true. Threw exception TypeError: The DOMWindow.name getter can only be used on instances of DOMWindow
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsgetOwnPropertyDescriptorwindowattributeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/getOwnPropertyDescriptor-window-attributes.html (0 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/getOwnPropertyDescriptor-window-attributes.html (rev 0)
+++ trunk/LayoutTests/js/getOwnPropertyDescriptor-window-attributes.html 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<script src="../resources/js-test-pre.js"></script>
+<script>
+description("Tests that Object.getOwnPropertyDescriptor() works correctly for Window properties");
+
+function checkWindowPropertyDescriptor(descriptor, readOnly)
+{
+ shouldBeType("descriptor.get", "Function");
+ if (readOnly)
+ shouldBeUndefined("descriptor.set");
+ else
+ shouldBeType("descriptor.set", "Function");
+ shouldBeTrue("descriptor.enumerable");
+ shouldBeTrue("descriptor.configurable");
+ nonWindowObject = document;
+ shouldThrow("descriptor.get.call(nonWindowObject)");
+}
+
+// The properties of global objects (such as Window) need to be on the instance as per the Web IDL specification,
+// even if they are not marked as [Unforgeable].
+
+debug("* Window.screen");
+descriptor = Object.getOwnPropertyDescriptor(window, "screen");
+checkWindowPropertyDescriptor(descriptor, false);
+shouldBeTrue("descriptor.get.call(window) === window.screen");
+shouldBeTrue("descriptor.get.call() === window.screen");
+
+debug("");
+debug("* Window.navigator");
+descriptor = Object.getOwnPropertyDescriptor(window, "navigator");
+checkWindowPropertyDescriptor(descriptor, false);
+shouldBeTrue("descriptor.get.call(window) === window.navigator");
+shouldBeTrue("descriptor.get.call() === window.navigator");
+
+debug("");
+debug("* Window.frameElement");
+descriptor = Object.getOwnPropertyDescriptor(window, "frameElement");
+checkWindowPropertyDescriptor(descriptor, true);
+shouldBeTrue("descriptor.get.call(window) === window.frameElement");
+shouldBeTrue("descriptor.get.call() === window.frameElement");
+
+debug("");
+debug("* Window.name");
+descriptor = Object.getOwnPropertyDescriptor(window, "name");
+checkWindowPropertyDescriptor(descriptor, false);
+shouldBeTrue("descriptor.get.call(window) === window.name");
+shouldBeTrue("descriptor.get.call() === window.name");
+
+</script>
+<script src="../resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsinstancepropertygetterotherinstanceexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/instance-property-getter-other-instance-expected.txt (0 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/instance-property-getter-other-instance-expected.txt (rev 0)
+++ trunk/LayoutTests/js/instance-property-getter-other-instance-expected.txt 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Tests that calling an instance property getter on another instance works as expected
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS locationGetter is an instance of function Function() {
+ [native code]
+}
+PASS locationGetter.call(otherWindow.document).toString() is "about:blank"
+FAIL locationGetter.call(window.document) === window.document.location should be true. Was false.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsinstancepropertygetterotherinstancehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/instance-property-getter-other-instance.html (0 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/instance-property-getter-other-instance.html (rev 0)
+++ trunk/LayoutTests/js/instance-property-getter-other-instance.html 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<body onload="runTest()">
+<script src="../resources/js-test-pre.js"></script>
+<script>
+description("Tests that calling an instance property getter on another instance works as expected");
+jsTestIsAsync = true;
+
+if (window.testRunner)
+ testRunner.setCanOpenWindows();
+
+function runTest()
+{
+ otherWindow = window.open("about:blank");
+ locationGetter = Object.getOwnPropertyDescriptor(otherWindow.document, "location").get;
+ shouldBeType("locationGetter", Function);
+ shouldBeEqualToString("locationGetter.call(otherWindow.document).toString()", "about:blank");
+ // Should return the current document's location.
+ shouldBeTrue("locationGetter.call(window.document) === window.document.location");
+ finishJSTest();
+}
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsresourcesgetOwnPropertyDescriptorjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/resources/getOwnPropertyDescriptor.js (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/resources/getOwnPropertyDescriptor.js 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/LayoutTests/js/resources/getOwnPropertyDescriptor.js 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -43,18 +43,14 @@
</span><span class="cx"> descriptorShouldBe("global", "'Infinity'", {writable: false, enumerable: false, configurable: false, value:"Infinity"});
</span><span class="cx"> descriptorShouldBe("global", "'window'", {writable: false, enumerable: true, configurable: false, value:"global"});
</span><span class="cx"> descriptorShouldBe("global", "'XMLHttpRequest'", {writable: true, enumerable: false, configurable: true, value:"XMLHttpRequest"});
</span><del>-descriptorShouldBe("global", "'length'", {get: undefined, set: undefined, enumerable: true, configurable: false});
</del><span class="cx"> descriptorShouldBe("global", "0", {writable: true, enumerable: false, configurable: false, value:"global[0]"});
</span><del>-descriptorShouldBe("document.getElementsByTagName('div')", "'length'", {get: undefined, set: undefined, enumerable: true, configurable: false});
</del><span class="cx"> descriptorShouldBe("document.getElementsByTagName('div')", "0", {writable: false, enumerable: true, configurable: false, value:"document.getElementsByTagName('div')[0]"});
</span><span class="cx"> descriptorShouldBe("document.getElementsByClassName('pass')", "0", {writable: false, enumerable: true, configurable: false, value:"document.getElementsByClassName('pass')[0]"});
</span><del>-descriptorShouldBe("document.getElementsByClassName('pass')", "'length'", {get: undefined, set: undefined, enumerable: true, configurable: false});
</del><span class="cx"> var canvas = document.createElement("canvas");
</span><span class="cx"> var canvasPixelArray = canvas.getContext("2d").createImageData(10,10).data;
</span><span class="cx"> descriptorShouldBe("canvasPixelArray", "0", {writable: true, enumerable: true, configurable: false, value:"canvasPixelArray[0]"});
</span><span class="cx"> var select = document.createElement("select");
</span><span class="cx"> select.innerHTML = "<option>foo</option>";
</span><del>-descriptorShouldBe("select", "'length'", {get: undefined, set: undefined, enumerable: true, configurable: false});
</del><span class="cx"> descriptorShouldBe("select", "0", {writable: true, enumerable: true, configurable: false, value:"select[0]"});
</span><span class="cx">
</span><span class="cx"> var objectWithGetter = {};
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2016-02-04 Chris Dumez <cdumez@apple.com>
+
+ Object.getOwnPropertyDescriptor() returns incomplete descriptor for instance properties
+ https://bugs.webkit.org/show_bug.cgi?id=153817
+
+ Reviewed by Geoffrey Garen.
+
+ Extend support for Object.getOwnPropertyDescriptor() on native bindings
+ to instance properties (e.g. Unforgeable properties or Global object
+ properties) so that the returned descriptor has getter / setter
+ functions, as expected.
+
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::reifyAllStaticProperties):
+ Add method that reifies all static properties, including the custom
+ accessors. This is similar to what is done eagerly on the prototype
+ objects in the bindings code.
+
+ (JSC::JSObject::getOwnPropertyDescriptor):
+ getOwnPropertyDescriptor() would previously fails for custom accessors
+ that are on the instance because getDirect() does not check the static
+ property table and those custom accessors were not reified (We only
+ reified all properties eagerly - including custom accessors - on
+ prototype objects. To address this issue, we now call
+ reifyAllStaticProperties() if the call to getDirect() fails and then
+ call getDirect() again. This fix is however insufficient for Window
+ properties because |this| is a JSDOMWindowShell / JSProxy in this case
+ and getDirect() / reifyAllStaticProperties() would fail as the proxy
+ does not actually have the properties. This issue was addressed by
+ checking if |this| is a JSProxy and then using JSProxy::target() instead
+ of |this| for the calls to getDirect() and for the reification.
+
+ * runtime/JSObject.h:
+ * runtime/Lookup.h:
+ (JSC::reifyStaticProperty):
+ (JSC::reifyStaticProperties):
+ Move most code in reifyStaticProperties() to a separate function so the
+ code can be shared with JSObject::reifyAllStaticProperties().
+ reifyStaticProperties() is currently called by the bindings on the
+ prototype objects.
+
</ins><span class="cx"> 2016-02-04 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix internal Windows build
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -1683,6 +1683,26 @@
</span><span class="cx"> structure(vm)->setStaticFunctionsReified(true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void JSObject::reifyAllStaticProperties(ExecState* exec)
+{
+ VM& vm = exec->vm();
+
+ for (const ClassInfo* info = classInfo(); info; info = info->parentClass) {
+ const HashTable* hashTable = info->staticPropHashTable;
+ if (!hashTable)
+ continue;
+
+ for (auto iter = hashTable->begin(); iter != hashTable->end(); ++iter) {
+ unsigned attributes;
+ PropertyOffset offset = getDirectOffset(vm, Identifier::fromString(&vm, iter.key()), attributes);
+ if (!isValidOffset(offset))
+ reifyStaticProperty(vm, *iter.value(), *this);
+ }
+ }
+
+ structure(vm)->setStaticFunctionsReified(true);
+}
+
</ins><span class="cx"> bool JSObject::removeDirect(VM& vm, PropertyName propertyName)
</span><span class="cx"> {
</span><span class="cx"> Structure* structure = this->structure(vm);
</span><span class="lines">@@ -2555,16 +2575,22 @@
</span><span class="cx"> else if (slot.attributes() & CustomAccessor) {
</span><span class="cx"> descriptor.setCustomDescriptor(slot.attributes());
</span><span class="cx">
</span><del>- JSValue maybeGetterSetter = getDirect(exec->vm(), propertyName);
- // FIXME: This currently does not work for properties that are on the instance and not reified.
- if (maybeGetterSetter) {
- auto* getterSetter = jsCast<CustomGetterSetter*>(maybeGetterSetter);
- ASSERT(getterSetter);
- if (getterSetter->getter())
- descriptor.setGetter(getBoundSlotBaseFunctionForGetterSetter(exec, propertyName, slot, getterSetter, JSBoundSlotBaseFunction::Type::Getter));
- if (getterSetter->setter())
- descriptor.setSetter(getBoundSlotBaseFunctionForGetterSetter(exec, propertyName, slot, getterSetter, JSBoundSlotBaseFunction::Type::Setter));
</del><ins>+ JSObject* thisObject = this;
+ if (auto* proxy = jsDynamicCast<JSProxy*>(this))
+ thisObject = proxy->target();
+
+ JSValue maybeGetterSetter = thisObject->getDirect(exec->vm(), propertyName);
+ if (!maybeGetterSetter) {
+ thisObject->reifyAllStaticProperties(exec);
+ maybeGetterSetter = thisObject->getDirect(exec->vm(), propertyName);
</ins><span class="cx"> }
</span><ins>+
+ ASSERT(maybeGetterSetter);
+ auto* getterSetter = jsCast<CustomGetterSetter*>(maybeGetterSetter);
+ if (getterSetter->getter())
+ descriptor.setGetter(getBoundSlotBaseFunctionForGetterSetter(exec, propertyName, slot, getterSetter, JSBoundSlotBaseFunction::Type::Getter));
+ if (getterSetter->setter())
+ descriptor.setSetter(getBoundSlotBaseFunctionForGetterSetter(exec, propertyName, slot, getterSetter, JSBoundSlotBaseFunction::Type::Setter));
</ins><span class="cx"> } else
</span><span class="cx"> descriptor.setDescriptor(slot.getValue(exec, propertyName), slot.attributes());
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -623,7 +623,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool staticFunctionsReified() { return structure()->staticFunctionsReified(); }
</span><del>- void reifyStaticFunctionsForDelete(ExecState* exec);
</del><ins>+ void reifyStaticFunctionsForDelete(ExecState*);
+ void reifyAllStaticProperties(ExecState*);
</ins><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE Butterfly* growOutOfLineStorage(VM&, size_t oldSize, size_t newSize);
</span><span class="cx"> void setButterflyWithoutChangingStructure(VM&, Butterfly*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookuph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.h (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.h 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.h 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -298,45 +298,49 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<unsigned numberOfValues>
-inline void reifyStaticProperties(VM& vm, const HashTableValue (&values)[numberOfValues], JSObject& thisObj)
</del><ins>+inline void reifyStaticProperty(VM& vm, const HashTableValue& value, JSObject& thisObj)
</ins><span class="cx"> {
</span><del>- BatchedTransitionOptimizer transitionOptimizer(vm, &thisObj);
- for (auto& value : values) {
- if (!value.m_key)
- continue;
</del><ins>+ if (!value.m_key)
+ return;
</ins><span class="cx">
</span><del>- Identifier propertyName = Identifier::fromString(&vm, reinterpret_cast<const LChar*>(value.m_key), strlen(value.m_key));
- if (value.attributes() & Builtin) {
- if (value.attributes() & Accessor)
- reifyStaticAccessor(vm, value, thisObj, propertyName);
- else
- thisObj.putDirectBuiltinFunction(vm, thisObj.globalObject(), propertyName, value.builtinGenerator()(vm), attributesForStructure(value.attributes()));
- continue;
- }
</del><ins>+ Identifier propertyName = Identifier::fromString(&vm, reinterpret_cast<const LChar*>(value.m_key), strlen(value.m_key));
+ if (value.attributes() & Builtin) {
+ if (value.attributes() & Accessor)
+ reifyStaticAccessor(vm, value, thisObj, propertyName);
+ else
+ thisObj.putDirectBuiltinFunction(vm, thisObj.globalObject(), propertyName, value.builtinGenerator()(vm), attributesForStructure(value.attributes()));
+ return;
+ }
</ins><span class="cx">
</span><del>- if (value.attributes() & Function) {
- thisObj.putDirectNativeFunction(
- vm, thisObj.globalObject(), propertyName, value.functionLength(),
- value.function(), value.intrinsic(), attributesForStructure(value.attributes()));
- continue;
- }
</del><ins>+ if (value.attributes() & Function) {
+ thisObj.putDirectNativeFunction(
+ vm, thisObj.globalObject(), propertyName, value.functionLength(),
+ value.function(), value.intrinsic(), attributesForStructure(value.attributes()));
+ return;
+ }
</ins><span class="cx">
</span><del>- if (value.attributes() & ConstantInteger) {
- thisObj.putDirect(vm, propertyName, jsNumber(value.constantInteger()), attributesForStructure(value.attributes()));
- continue;
- }
</del><ins>+ if (value.attributes() & ConstantInteger) {
+ thisObj.putDirect(vm, propertyName, jsNumber(value.constantInteger()), attributesForStructure(value.attributes()));
+ return;
+ }
</ins><span class="cx">
</span><del>- if (value.attributes() & Accessor) {
- reifyStaticAccessor(vm, value, thisObj, propertyName);
- continue;
- }
</del><ins>+ if (value.attributes() & Accessor) {
+ reifyStaticAccessor(vm, value, thisObj, propertyName);
+ return;
+ }
</ins><span class="cx">
</span><del>- CustomGetterSetter* customGetterSetter = CustomGetterSetter::create(vm, value.propertyGetter(), value.propertyPutter());
- thisObj.putDirectCustomAccessor(vm, propertyName, customGetterSetter, attributesForStructure(value.attributes()));
- }
</del><ins>+ CustomGetterSetter* customGetterSetter = CustomGetterSetter::create(vm, value.propertyGetter(), value.propertyPutter());
+ thisObj.putDirectCustomAccessor(vm, propertyName, customGetterSetter, attributesForStructure(value.attributes()));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+template<unsigned numberOfValues>
+inline void reifyStaticProperties(VM& vm, const HashTableValue (&values)[numberOfValues], JSObject& thisObj)
+{
+ BatchedTransitionOptimizer transitionOptimizer(vm, &thisObj);
+ for (auto& value : values)
+ reifyStaticProperty(vm, value, thisObj);
+}
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // Lookup_h
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/Source/WebCore/ChangeLog 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -1,3 +1,63 @@
</span><ins>+2016-02-04 Chris Dumez <cdumez@apple.com>
+
+ Object.getOwnPropertyDescriptor() returns incomplete descriptor for instance properties
+ https://bugs.webkit.org/show_bug.cgi?id=153817
+
+ Reviewed by Geoffrey Garen.
+
+ Update the bindings generator so that property getters / setters now
+ make sure |this| has the right type and throw a TypeError if it does
+ not, as per:
+ - http://heycam.github.io/webidl/#dfn-attribute-getter (step 2.4.2)
+ - http://heycam.github.io/webidl/#dfn-attribute-setter (step 3.5)
+
+ This was an issue when doing something like:
+ Object.getOwnPropertyDescriptor(window, "location").get.call(nonWindow)
+
+ We would call toJSDOMWindow(thisValue), which would return null as
+ thisValue is not a JSDOMWindow. We would then dereference this null
+ pointer and crash. We now do a null check and throw a TypeError in
+ this case, as per the Web IDL specification.
+
+ The generated bindings still have some non-spec compliant behavior
+ though:
+ 1. The getters / setters of instance properties use slotBase instead
+ of thisValue, which means that calling instanceA's getter on
+ instanceB returns instanceA's property insteas of instanceB's.
+ 2. Global object property getters should not require an explicit
+ |this| so calling the following should work:
+ - Object.getOwnPropertyDescriptor(window, "location").get.call()
+ We currently throw in this case.
+
+ These issues will be addressed in follow-up patches.
+
+ Tests: js/getOwnPropertyDescriptor-unforgeable-attributes.html
+ js/getOwnPropertyDescriptor-window-attributes.html
+ js/instance-property-getter-other-instance.html
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
+ (WebCore::jsTestActiveDOMObjectExcitingAttr):
+ * bindings/scripts/test/JS/JSTestException.cpp:
+ (WebCore::jsTestExceptionName):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjConstructorTestSubObj):
+ (WebCore::jsTestObjTestSubObjEnabledBySettingConstructor):
+ (WebCore::jsTestObjConditionalAttr4Constructor):
+ (WebCore::jsTestObjConditionalAttr5Constructor):
+ (WebCore::jsTestObjConditionalAttr6Constructor):
+ (WebCore::jsTestObjContentDocument):
+ (WebCore::setJSTestObjTestSubObjEnabledBySettingConstructor):
+ (WebCore::setJSTestObjConditionalAttr4Constructor):
+ (WebCore::setJSTestObjConditionalAttr5Constructor):
+ (WebCore::setJSTestObjConditionalAttr6Constructor):
+ (WebCore::setJSTestObjConstructor): Deleted.
+ (WebCore::setJSTestObjConstructorStaticStringAttr): Deleted.
+ (WebCore::setJSTestObjConditionalAttr3): Deleted.
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ (WebCore::jsTestTypedefsConstructorTestSubObj):
+
</ins><span class="cx"> 2016-02-04 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: LayoutTest imported/w3c/indexeddb/keyorder-private.html is flaky.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -2285,24 +2285,27 @@
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(slotBase);\n");
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(thisValue);\n");
</span><span class="cx"> if (!$attribute->isStatic || $attribute->signature->type =~ /Constructor$/) {
</span><ins>+ my $variableForTypeCheck = "castedThis";
</ins><span class="cx"> if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
</span><span class="cx"> push(@implContent, " auto* castedThis = to${className}(JSValue::decode(thisValue));\n");
</span><span class="cx"> } elsif (AttributeShouldBeOnInstance($interface, $attribute)) {
</span><ins>+ # FIXME: This does not seem right, we should likely use thisValue instead of slotBase here to match the specification:
+ # http://heycam.github.io/webidl/#dfn-attribute-getter
</ins><span class="cx"> push(@implContent, " auto* castedThis = jsCast<JS${interfaceName}*>(slotBase);\n");
</span><del>- if (InterfaceRequiresAttributesOnInstanceForCompatibility($interface)) {
- push(@implContent, " ${className}* castedThisObject = " . GetCastingHelperForThisObject($interface) . "(JSValue::decode(thisValue));\n");
- push(@implContent, " if (UNLIKELY(!castedThisObject))\n");
- push(@implContent, " reportDeprecatedGetterError(*state, \"$interfaceName\", \"$name\");\n");
- }
</del><ins>+ push(@implContent, " ${className}* castedThisObject = " . GetCastingHelperForThisObject($interface) . "(JSValue::decode(thisValue));\n");
+ $variableForTypeCheck = "castedThisObject";
</ins><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " ${className}* castedThis = " . GetCastingHelperForThisObject($interface) . "(JSValue::decode(thisValue));\n");
</span><del>- push(@implContent, " if (UNLIKELY(!castedThis))\n");
- if ($attribute->signature->extendedAttributes->{"LenientThis"}) {
- push(@implContent, " return JSValue::encode(jsUndefined());\n");
- } else {
- push(@implContent, " return throwGetterTypeError(*state, \"$interfaceName\", \"$name\");\n");
- }
</del><span class="cx"> }
</span><ins>+ # FIXME: Getters on a global should not require an explicit this.
+ push(@implContent, " if (UNLIKELY(!$variableForTypeCheck))\n");
+ if ($attribute->signature->extendedAttributes->{"LenientThis"}) {
+ push(@implContent, " return JSValue::encode(jsUndefined());\n");
+ } elsif (InterfaceRequiresAttributesOnInstanceForCompatibility($interface)) {
+ push(@implContent, " reportDeprecatedGetterError(*state, \"$interfaceName\", \"$name\");\n");
+ } else {
+ push(@implContent, " return throwGetterTypeError(*state, \"$interfaceName\", \"$name\");\n");
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my @arguments = ();
</span><span class="lines">@@ -2619,28 +2622,26 @@
</span><span class="cx"> push(@implContent, " JSValue value = JSValue::decode(encodedValue);\n");
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(baseObject);\n");
</span><span class="cx"> if (!$attribute->isStatic) {
</span><ins>+ my $variableForTypeCheck = "castedThis";
</ins><span class="cx"> if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
</span><span class="cx"> push(@implContent, " ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
</span><span class="cx"> } elsif (AttributeShouldBeOnInstance($interface, $attribute)) {
</span><del>- push(@implContent, " UNUSED_PARAM(thisValue);\n");
</del><span class="cx"> push(@implContent, " auto* castedThis = jsCast<JS${interfaceName}*>(baseObject);\n");
</span><del>- if (InterfaceRequiresAttributesOnInstanceForCompatibility($interface)) {
- push(@implContent, " ${className}* castedThisObject = " . GetCastingHelperForThisObject($interface) . "(JSValue::decode(thisValue));\n");
- push(@implContent, " if (UNLIKELY(!castedThisObject))\n");
- push(@implContent, " reportDeprecatedSetterError(*state, \"$interfaceName\", \"$name\");\n");
- } else {
- push(@implContent, " UNUSED_PARAM(thisValue);\n");
- push(@implContent, " UNUSED_PARAM(state);\n");
- }
</del><ins>+ push(@implContent, " ${className}* castedThisObject = " . GetCastingHelperForThisObject($interface) . "(JSValue::decode(thisValue));\n");
+ $variableForTypeCheck = "castedThisObject";
</ins><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " ${className}* castedThis = " . GetCastingHelperForThisObject($interface) . "(JSValue::decode(thisValue));\n");
</span><del>- push(@implContent, " if (UNLIKELY(!castedThis)) {\n");
- if (!$attribute->signature->extendedAttributes->{"LenientThis"}) {
- push(@implContent, " throwSetterTypeError(*state, \"$interfaceName\", \"$name\");\n");
- }
</del><ins>+ }
+ push(@implContent, " if (UNLIKELY(!$variableForTypeCheck)) {\n");
+ if ($attribute->signature->extendedAttributes->{"LenientThis"}) {
</ins><span class="cx"> push(@implContent, " return;\n");
</span><del>- push(@implContent, " }\n");
</del><ins>+ } elsif (InterfaceRequiresAttributesOnInstanceForCompatibility($interface)) {
+ push(@implContent, " reportDeprecatedSetterError(*state, \"$interfaceName\", \"$name\");\n");
+ } else {
+ push(@implContent, " throwSetterTypeError(*state, \"$interfaceName\", \"$name\");\n");
+ push(@implContent, " return;\n");
</ins><span class="cx"> }
</span><ins>+ push(@implContent, " }\n");
</ins><span class="cx"> }
</span><span class="cx"> if ($interface->extendedAttributes->{"CheckSecurity"} && !$attribute->signature->extendedAttributes->{"DoNotCheckSecurity"}) {
</span><span class="cx"> if ($interfaceName eq "DOMWindow") {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -150,6 +150,9 @@
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> auto* castedThis = jsCast<JSTestActiveDOMObject*>(slotBase);
</span><ins>+ JSTestActiveDOMObject* castedThisObject = jsDynamicCast<JSTestActiveDOMObject*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject))
+ return throwGetterTypeError(*state, "TestActiveDOMObject", "excitingAttr");
</ins><span class="cx"> if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->wrapped()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestExceptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -140,6 +140,9 @@
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> auto* castedThis = jsCast<JSTestException*>(slotBase);
</span><ins>+ JSTestException* castedThisObject = jsDynamicCast<JSTestException*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject))
+ return throwGetterTypeError(*state, "TestException", "name");
</ins><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> JSValue result = jsStringWithCache(state, impl.name());
</span><span class="cx"> return JSValue::encode(result);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -810,6 +810,9 @@
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> auto* castedThis = jsCast<JSTestObj*>(slotBase);
</span><ins>+ JSTestObj* castedThisObject = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject))
+ return throwGetterTypeError(*state, "TestObj", "TestSubObj");
</ins><span class="cx"> return JSValue::encode(JSTestSubObj::getConstructor(state->vm(), castedThis->globalObject()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -820,6 +823,9 @@
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> auto* castedThis = jsCast<JSTestObj*>(slotBase);
</span><ins>+ JSTestObj* castedThisObject = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject))
+ return throwGetterTypeError(*state, "TestObj", "TestSubObjEnabledBySetting");
</ins><span class="cx"> if (!castedThis->wrapped().frame())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> Settings& settings = castedThis->wrapped().frame()->settings();
</span><span class="lines">@@ -1506,6 +1512,9 @@
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> auto* castedThis = jsCast<JSTestObj*>(slotBase);
</span><ins>+ JSTestObj* castedThisObject = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject))
+ return throwGetterTypeError(*state, "TestObj", "conditionalAttr4");
</ins><span class="cx"> return JSValue::encode(JSTestObjectA::getConstructor(state->vm(), castedThis->globalObject()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1518,6 +1527,9 @@
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> auto* castedThis = jsCast<JSTestObj*>(slotBase);
</span><ins>+ JSTestObj* castedThisObject = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject))
+ return throwGetterTypeError(*state, "TestObj", "conditionalAttr5");
</ins><span class="cx"> return JSValue::encode(JSTestObjectB::getConstructor(state->vm(), castedThis->globalObject()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1530,6 +1542,9 @@
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> auto* castedThis = jsCast<JSTestObj*>(slotBase);
</span><ins>+ JSTestObj* castedThisObject = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject))
+ return throwGetterTypeError(*state, "TestObj", "conditionalAttr6");
</ins><span class="cx"> return JSValue::encode(JSTestObjectC::getConstructor(state->vm(), castedThis->globalObject()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1589,6 +1604,9 @@
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> auto* castedThis = jsCast<JSTestObj*>(slotBase);
</span><ins>+ JSTestObj* castedThisObject = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject))
+ return throwGetterTypeError(*state, "TestObj", "contentDocument");
</ins><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> return JSValue::encode(shouldAllowAccessToNode(state, impl.contentDocument()) ? toJS(state, castedThis->globalObject(), WTF::getPtr(impl.contentDocument())) : jsNull());
</span><span class="cx"> }
</span><span class="lines">@@ -1884,10 +1902,12 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> UNUSED_PARAM(baseObject);
</span><del>- UNUSED_PARAM(thisValue);
</del><span class="cx"> auto* castedThis = jsCast<JSTestObj*>(baseObject);
</span><del>- UNUSED_PARAM(thisValue);
- UNUSED_PARAM(state);
</del><ins>+ JSTestObj* castedThisObject = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject)) {
+ throwSetterTypeError(*state, "TestObj", "TestSubObjEnabledBySetting");
+ return;
+ }
</ins><span class="cx"> // Shadowing a built-in constructor.
</span><span class="cx"> castedThis->putDirect(state->vm(), Identifier::fromString(state, "TestSubObjEnabledBySetting"), value);
</span><span class="cx"> }
</span><span class="lines">@@ -2670,10 +2690,12 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> UNUSED_PARAM(baseObject);
</span><del>- UNUSED_PARAM(thisValue);
</del><span class="cx"> auto* castedThis = jsCast<JSTestObj*>(baseObject);
</span><del>- UNUSED_PARAM(thisValue);
- UNUSED_PARAM(state);
</del><ins>+ JSTestObj* castedThisObject = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject)) {
+ throwSetterTypeError(*state, "TestObj", "conditionalAttr4");
+ return;
+ }
</ins><span class="cx"> // Shadowing a built-in constructor.
</span><span class="cx"> castedThis->putDirect(state->vm(), Identifier::fromString(state, "conditionalAttr4"), value);
</span><span class="cx"> }
</span><span class="lines">@@ -2685,10 +2707,12 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> UNUSED_PARAM(baseObject);
</span><del>- UNUSED_PARAM(thisValue);
</del><span class="cx"> auto* castedThis = jsCast<JSTestObj*>(baseObject);
</span><del>- UNUSED_PARAM(thisValue);
- UNUSED_PARAM(state);
</del><ins>+ JSTestObj* castedThisObject = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject)) {
+ throwSetterTypeError(*state, "TestObj", "conditionalAttr5");
+ return;
+ }
</ins><span class="cx"> // Shadowing a built-in constructor.
</span><span class="cx"> castedThis->putDirect(state->vm(), Identifier::fromString(state, "conditionalAttr5"), value);
</span><span class="cx"> }
</span><span class="lines">@@ -2700,10 +2724,12 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> UNUSED_PARAM(baseObject);
</span><del>- UNUSED_PARAM(thisValue);
</del><span class="cx"> auto* castedThis = jsCast<JSTestObj*>(baseObject);
</span><del>- UNUSED_PARAM(thisValue);
- UNUSED_PARAM(state);
</del><ins>+ JSTestObj* castedThisObject = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject)) {
+ throwSetterTypeError(*state, "TestObj", "conditionalAttr6");
+ return;
+ }
</ins><span class="cx"> // Shadowing a built-in constructor.
</span><span class="cx"> castedThis->putDirect(state->vm(), Identifier::fromString(state, "conditionalAttr6"), value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (196144 => 196145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-02-04 21:20:10 UTC (rev 196144)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-02-04 21:36:04 UTC (rev 196145)
</span><span class="lines">@@ -244,6 +244,9 @@
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> auto* castedThis = jsCast<JSTestTypedefs*>(slotBase);
</span><ins>+ JSTestTypedefs* castedThisObject = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!castedThisObject))
+ return throwGetterTypeError(*state, "TestTypedefs", "TestSubObj");
</ins><span class="cx"> return JSValue::encode(JSTestSubObj::getConstructor(state->vm(), castedThis->globalObject()));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>