<!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>[211778] 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/211778">211778</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-02-07 00:51:09 -0800 (Tue, 07 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Object.preventExtensions() on a Location object should throw a TypeError
https://bugs.webkit.org/show_bug.cgi?id=167917
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
Rebaseline web platform test now that one more check is passing.
* web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt:
Source/WebCore:
Object.preventExtensions() on a Location object should throw a TypeError:
- https://html.spec.whatwg.org/#location-preventextensions
- https://www.ecma-international.org/ecma-262/7.0/index.html#sec-object.preventextensions
Firefox already implements this.
No new tests, rebaselined existing tests.
* bindings/js/JSLocationCustom.cpp:
(WebCore::JSLocation::preventExtensions):
LayoutTests:
Rebaseline test now that more checks are passing.
* http/tests/security/preventExtensions-window-location-expected.txt:
* http/tests/security/preventExtensions-window-location.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritypreventExtensionswindowlocationexpectedtxt">trunk/LayoutTests/http/tests/security/preventExtensions-window-location-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritypreventExtensionswindowlocationhtml">trunk/LayoutTests/http/tests/security/preventExtensions-window-location.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlbrowsersorigincrossoriginobjectscrossoriginobjectsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSLocationCustomcpp">trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211777 => 211778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-07 08:17:17 UTC (rev 211777)
+++ trunk/LayoutTests/ChangeLog 2017-02-07 08:51:09 UTC (rev 211778)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-07 Chris Dumez <cdumez@apple.com>
+
+ Object.preventExtensions() on a Location object should throw a TypeError
+ https://bugs.webkit.org/show_bug.cgi?id=167917
+
+ Reviewed by Alex Christensen.
+
+ Rebaseline test now that more checks are passing.
+
+ * http/tests/security/preventExtensions-window-location-expected.txt:
+ * http/tests/security/preventExtensions-window-location.html:
+
</ins><span class="cx"> 2017-02-07 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: allow import() inside the inspector
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritypreventExtensionswindowlocationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/preventExtensions-window-location-expected.txt (211777 => 211778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/preventExtensions-window-location-expected.txt 2017-02-07 08:17:17 UTC (rev 211777)
+++ trunk/LayoutTests/http/tests/security/preventExtensions-window-location-expected.txt 2017-02-07 08:51:09 UTC (rev 211778)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> PASS Object.preventExtensions(frames[0]) threw exception TypeError: Cannot prevent extensions on this object.
</span><span class="cx"> PASS Object.isExtensible(frames[0]) is true
</span><span class="cx"> PASS Object.isExtensible(frames[0].location) is true
</span><del>-PASS Object.preventExtensions(frames[0].location) threw exception SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match..
</del><ins>+PASS Object.preventExtensions(frames[0].location) threw exception TypeError: Cannot prevent extensions on this object.
</ins><span class="cx"> PASS Object.isExtensible(frames[0].location) is true
</span><span class="cx">
</span><span class="cx"> * Same origin
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> PASS Object.preventExtensions(window) threw exception TypeError: Cannot prevent extensions on this object.
</span><span class="cx"> PASS Object.isExtensible(window) is true
</span><span class="cx"> PASS Object.isExtensible(window.location) is true
</span><del>-FAIL Object.preventExtensions(window.location) should throw a TypeError. Did not throw.
-FAIL Object.isExtensible(window.location) should be true. Was false.
</del><ins>+PASS Object.preventExtensions(window.location) threw exception TypeError: Cannot prevent extensions on this object.
+PASS Object.isExtensible(window.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="trunkLayoutTestshttptestssecuritypreventExtensionswindowlocationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/preventExtensions-window-location.html (211777 => 211778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/preventExtensions-window-location.html 2017-02-07 08:17:17 UTC (rev 211777)
+++ trunk/LayoutTests/http/tests/security/preventExtensions-window-location.html 2017-02-07 08:51:09 UTC (rev 211778)
</span><span class="lines">@@ -14,8 +14,7 @@
</span><span class="cx"> shouldBeTrue("Object.isExtensible(frames[0])");
</span><span class="cx">
</span><span class="cx"> shouldBeTrue("Object.isExtensible(frames[0].location)");
</span><del>- // FIXME: Should throw a TypeError once we start throw in the same origin case as well.
- shouldThrowErrorName("Object.preventExtensions(frames[0].location)", "SecurityError");
</del><ins>+ shouldThrowErrorName("Object.preventExtensions(frames[0].location)", "TypeError");
</ins><span class="cx"> shouldBeTrue("Object.isExtensible(frames[0].location)");
</span><span class="cx">
</span><span class="cx"> debug("");
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (211777 => 211778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-02-07 08:17:17 UTC (rev 211777)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-02-07 08:51:09 UTC (rev 211778)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-07 Chris Dumez <cdumez@apple.com>
+
+ Object.preventExtensions() on a Location object should throw a TypeError
+ https://bugs.webkit.org/show_bug.cgi?id=167917
+
+ Reviewed by Alex Christensen.
+
+ Rebaseline web platform test now that one more check is passing.
+
+ * web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt:
+
</ins><span class="cx"> 2017-02-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Symbols exposed on cross-origin Window / Location objects should be configurable
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlbrowsersorigincrossoriginobjectscrossoriginobjectsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt (211777 => 211778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt 2017-02-07 08:17:17 UTC (rev 211777)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt 2017-02-07 08:51:09 UTC (rev 211778)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> PASS [[IsExtensible]] should return true for cross-origin objects
</span><span class="cx"> PASS [[IsExtensible]] should return true for cross-origin objects (exception type)
</span><span class="cx"> PASS [[PreventExtensions]] should throw for cross-origin objects
</span><del>-FAIL [[PreventExtensions]] should throw for cross-origin objects (exception type) assert_throws: preventExtensions on cross-origin Location should throw function "function () { Object.preventExtensions(C.location) }" threw object "SecurityError (DOM Exception 18): Blocked a frame with or..." ("SecurityError") expected object "TypeError" ("TypeError")
</del><ins>+PASS [[PreventExtensions]] should throw for cross-origin objects (exception type)
</ins><span class="cx"> PASS [[GetOwnProperty]] - Properties on cross-origin objects should be reported |own|
</span><span class="cx"> PASS [[GetOwnProperty]] - Properties on cross-origin objects should be reported |own| (exception type)
</span><span class="cx"> PASS [[GetOwnProperty]] - Property descriptors for cross-origin properties should be set up correctly
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211777 => 211778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-07 08:17:17 UTC (rev 211777)
+++ trunk/Source/WebCore/ChangeLog 2017-02-07 08:51:09 UTC (rev 211778)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-07 Chris Dumez <cdumez@apple.com>
+
+ Object.preventExtensions() on a Location object should throw a TypeError
+ https://bugs.webkit.org/show_bug.cgi?id=167917
+
+ Reviewed by Alex Christensen.
+
+ Object.preventExtensions() on a Location object should throw a TypeError:
+ - https://html.spec.whatwg.org/#location-preventextensions
+ - https://www.ecma-international.org/ecma-262/7.0/index.html#sec-object.preventextensions
+
+ Firefox already implements this.
+
+ No new tests, rebaselined existing tests.
+
+ * bindings/js/JSLocationCustom.cpp:
+ (WebCore::JSLocation::preventExtensions):
+
</ins><span class="cx"> 2017-02-07 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: allow import() inside the inspector
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSLocationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp (211777 => 211778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2017-02-07 08:17:17 UTC (rev 211777)
+++ trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2017-02-07 08:51:09 UTC (rev 211778)
</span><span class="lines">@@ -181,14 +181,12 @@
</span><span class="cx"> return Base::getPrototype(object, exec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSLocation::preventExtensions(JSObject* object, ExecState* exec)
</del><ins>+bool JSLocation::preventExtensions(JSObject*, ExecState* exec)
</ins><span class="cx"> {
</span><del>- JSLocation* thisObject = jsCast<JSLocation*>(object);
- if (!BindingSecurity::shouldAllowAccessToFrame(exec, thisObject->wrapped().frame(), ThrowSecurityError))
- return false;
- // FIXME: The specification says to return false in the same origin case as well but other browsers have
- // not implemented this yet.
- return Base::preventExtensions(object, exec);
</del><ins>+ auto scope = DECLARE_THROW_SCOPE(exec->vm());
+
+ throwTypeError(exec, scope, ASCIILiteral("Cannot prevent extensions on this object"));
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String JSLocation::toStringName(const JSObject* object, ExecState* exec)
</span></span></pre>
</div>
</div>
</body>
</html>