<!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>[205404] 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/205404">205404</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-03 07:44:59 -0700 (Sat, 03 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Object.preventExtensions(window) should throw a TypeError
https://bugs.webkit.org/show_bug.cgi?id=161554
Reviewed by Darin Adler.
Source/WebCore:
Object.preventExtensions(window) should throw a TypeError.
[[PreventExtensions]] should return false for Window:
- https://html.spec.whatwg.org/#windowproxy-preventextensions
EcmaScript says that Object.preventExtensions() should throw a TypeError
if [[PreventExtension]] returns false:
- https://tc39.github.io/ecma262/#sec-object.preventextensions
No new tests, updated existing test.
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::JSDOMWindow::preventExtensions):
LayoutTests:
* 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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205403 => 205404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-03 14:42:18 UTC (rev 205403)
+++ trunk/LayoutTests/ChangeLog 2016-09-03 14:44:59 UTC (rev 205404)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-03 Chris Dumez <cdumez@apple.com>
+
+ Object.preventExtensions(window) should throw a TypeError
+ https://bugs.webkit.org/show_bug.cgi?id=161554
+
+ Reviewed by Darin Adler.
+
+ * http/tests/security/preventExtensions-window-location-expected.txt:
+ * http/tests/security/preventExtensions-window-location.html:
+
</ins><span class="cx"> 2016-09-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Address ESLint undefined variable errors
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritypreventExtensionswindowlocationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/preventExtensions-window-location-expected.txt (205403 => 205404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/preventExtensions-window-location-expected.txt 2016-09-03 14:42:18 UTC (rev 205403)
+++ trunk/LayoutTests/http/tests/security/preventExtensions-window-location-expected.txt 2016-09-03 14:44:59 UTC (rev 205404)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> * Cross origin
</span><span class="cx"> PASS Object.isExtensible(frames[0]) is true
</span><del>-PASS Object.preventExtensions(frames[0]) 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]) threw exception TypeError: Cannot prevent extensions on this object.
</ins><span class="cx"> PASS Object.isExtensible(frames[0]) is true
</span><span class="cx"> PASS Object.isExtensible(frames[0].location) is true
</span><span class="cx"> 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..
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">
</span><span class="cx"> * Same origin
</span><span class="cx"> PASS Object.isExtensible(window) is true
</span><del>-FAIL Object.preventExtensions(window) should throw a TypeError. Did not throw.
</del><ins>+PASS Object.preventExtensions(window) threw exception TypeError: Cannot prevent extensions on this object.
</ins><span class="cx"> PASS Object.isExtensible(window) is true
</span><span class="cx"> PASS Object.isExtensible(window.location) is true
</span><span class="cx"> FAIL Object.preventExtensions(window.location) should throw a TypeError. Did not throw.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritypreventExtensionswindowlocationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/preventExtensions-window-location.html (205403 => 205404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/preventExtensions-window-location.html 2016-09-03 14:42:18 UTC (rev 205403)
+++ trunk/LayoutTests/http/tests/security/preventExtensions-window-location.html 2016-09-03 14:44:59 UTC (rev 205404)
</span><span class="lines">@@ -10,10 +10,11 @@
</span><span class="cx"> onload = function() {
</span><span class="cx"> debug ("* Cross origin");
</span><span class="cx"> shouldBeTrue("Object.isExtensible(frames[0])");
</span><del>- shouldThrowErrorName("Object.preventExtensions(frames[0])", "SecurityError");
</del><ins>+ shouldThrowErrorName("Object.preventExtensions(frames[0])", "TypeError");
</ins><span class="cx"> shouldBeTrue("Object.isExtensible(frames[0])");
</span><span class="cx">
</span><span class="cx"> shouldBeTrue("Object.isExtensible(frames[0].location)");
</span><ins>+ // FIXME: Should throw a TypeError once we start throw in the same origin case as well.
</ins><span class="cx"> shouldThrowErrorName("Object.preventExtensions(frames[0].location)", "SecurityError");
</span><span class="cx"> shouldBeTrue("Object.isExtensible(frames[0].location)");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205403 => 205404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-03 14:42:18 UTC (rev 205403)
+++ trunk/Source/WebCore/ChangeLog 2016-09-03 14:44:59 UTC (rev 205404)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-09-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Object.preventExtensions(window) should throw a TypeError
+ https://bugs.webkit.org/show_bug.cgi?id=161554
+
+ Reviewed by Darin Adler.
+
+ Object.preventExtensions(window) should throw a TypeError.
+
+ [[PreventExtensions]] should return false for Window:
+ - https://html.spec.whatwg.org/#windowproxy-preventextensions
+
+ EcmaScript says that Object.preventExtensions() should throw a TypeError
+ if [[PreventExtension]] returns false:
+ - https://tc39.github.io/ecma262/#sec-object.preventextensions
+
+ No new tests, updated existing test.
+
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::JSDOMWindow::preventExtensions):
+
+2016-09-03 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Align meta element http-equiv="refresh" parsing with the HTML specification
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161543
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (205403 => 205404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-09-03 14:42:18 UTC (rev 205403)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-09-03 14:44:59 UTC (rev 205404)
</span><span class="lines">@@ -342,11 +342,11 @@
</span><span class="cx"> return Base::defineOwnProperty(thisObject, exec, propertyName, descriptor, shouldThrow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSDOMWindow::preventExtensions(JSObject* object, ExecState* exec)
</del><ins>+bool JSDOMWindow::preventExtensions(JSObject*, ExecState* exec)
</ins><span class="cx"> {
</span><del>- JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(object);
- if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped(), ThrowSecurityError))
- return false;
</del><ins>+ auto scope = DECLARE_THROW_SCOPE(exec->vm());
+
+ throwTypeError(exec, scope, ASCIILiteral("Cannot prevent extensions on this object"));
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>