<!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>[201022] 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/201022">201022</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-17 11:20:26 -0700 (Tue, 17 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>console namespace breaks putting properties on console.__proto__
https://bugs.webkit.org/show_bug.cgi?id=157782
<rdar://problem/26250526>
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Some websites currently depend on console.__proto__ existing and being
a separate object from Object.prototype. This patch adds back a basic
console.__proto__ object, but all the console functions are left on
the ConsoleObject itself.
* runtime/JSGlobalObject.cpp:
(JSC::createConsoleProperty):
LayoutTests:
* js/console-expected.txt:
* js/console.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsconsoleexpectedtxt">trunk/LayoutTests/js/console-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsconsolehtml">trunk/LayoutTests/js/console.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201021 => 201022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-17 17:58:57 UTC (rev 201021)
+++ trunk/LayoutTests/ChangeLog 2016-05-17 18:20:26 UTC (rev 201022)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-05-17 Joseph Pecoraro <pecoraro@apple.com>
+
+ console namespace breaks putting properties on console.__proto__
+ https://bugs.webkit.org/show_bug.cgi?id=157782
+ <rdar://problem/26250526>
+
+ Reviewed by Geoffrey Garen.
+
+ * js/console-expected.txt:
+ * js/console.html:
+
</ins><span class="cx"> 2016-05-17 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201017.
</span></span></pre></div>
<a id="trunkLayoutTestsjsconsoleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/console-expected.txt (201021 => 201022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/console-expected.txt 2016-05-17 17:58:57 UTC (rev 201021)
+++ trunk/LayoutTests/js/console-expected.txt 2016-05-17 18:20:26 UTC (rev 201022)
</span><span class="lines">@@ -1,17 +1,17 @@
</span><del>-CONSOLE MESSAGE: line 19: log message
-CONSOLE MESSAGE: line 20: log message
</del><span class="cx"> CONSOLE MESSAGE: line 21: log message
</span><span class="cx"> CONSOLE MESSAGE: line 22: log message
</span><span class="cx"> CONSOLE MESSAGE: line 23: log message
</span><span class="cx"> CONSOLE MESSAGE: line 24: log message
</span><ins>+CONSOLE MESSAGE: line 25: log message
</ins><span class="cx"> CONSOLE MESSAGE: line 26: log message
</span><ins>+CONSOLE MESSAGE: line 28: log message
</ins><span class="cx"> CONSOLE MESSAGE: line 1: 1
</span><span class="cx"> CONSOLE MESSAGE: line 1: 2
</span><span class="cx"> CONSOLE MESSAGE: line 1: 3
</span><span class="cx"> PASS typeof console is "object"
</span><span class="cx"> PASS console.toString() is "[object Console]"
</span><del>-PASS Object.getPrototypeOf(console) is Object.getPrototypeOf({})
</del><span class="cx"> PASS console is console
</span><ins>+PASS Object.getPrototypeOf(console) is not Object.getPrototypeOf({})
</ins><span class="cx"> PASS consoleDescriptor.configurable is true
</span><span class="cx"> PASS consoleDescriptor.writable is true
</span><span class="cx"> PASS consoleDescriptor.enumerable is false
</span></span></pre></div>
<a id="trunkLayoutTestsjsconsolehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/console.html (201021 => 201022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/console.html 2016-05-17 17:58:57 UTC (rev 201021)
+++ trunk/LayoutTests/js/console.html 2016-05-17 18:20:26 UTC (rev 201022)
</span><span class="lines">@@ -7,9 +7,11 @@
</span><span class="cx"> <script>
</span><span class="cx"> shouldBeEqualToString("typeof console", "object");
</span><span class="cx"> shouldBeEqualToString("console.toString()", "[object Console]");
</span><del>-shouldBe("Object.getPrototypeOf(console)", "Object.getPrototypeOf({})");
</del><span class="cx"> shouldBe("console", "console");
</span><span class="cx">
</span><ins>+// <https://webkit.org/b/157782> console namespace breaks putting properties on console.__proto__
+shouldNotBe("Object.getPrototypeOf(console)", "Object.getPrototypeOf({})");
+
</ins><span class="cx"> var consoleDescriptor = Object.getOwnPropertyDescriptor(window, "console");
</span><span class="cx"> shouldBeTrue('consoleDescriptor.configurable');
</span><span class="cx"> shouldBeTrue('consoleDescriptor.writable');
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201021 => 201022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-17 17:58:57 UTC (rev 201021)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-17 18:20:26 UTC (rev 201022)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-17 Joseph Pecoraro <pecoraro@apple.com>
+
+ console namespace breaks putting properties on console.__proto__
+ https://bugs.webkit.org/show_bug.cgi?id=157782
+ <rdar://problem/26250526>
+
+ Reviewed by Geoffrey Garen.
+
+ Some websites currently depend on console.__proto__ existing and being
+ a separate object from Object.prototype. This patch adds back a basic
+ console.__proto__ object, but all the console functions are left on
+ the ConsoleObject itself.
+
+ * runtime/JSGlobalObject.cpp:
+ (JSC::createConsoleProperty):
+
</ins><span class="cx"> 2016-05-17 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, dump more information when math-pow-stable-results.js failed
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (201021 => 201022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-05-17 17:58:57 UTC (rev 201021)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-05-17 18:20:26 UTC (rev 201022)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> static JSValue createConsoleProperty(VM& vm, JSObject* object)
</span><span class="cx"> {
</span><span class="cx"> JSGlobalObject* global = jsCast<JSGlobalObject*>(object);
</span><del>- return ConsoleObject::create(vm, global, ConsoleObject::createStructure(vm, global, global->objectPrototype()));
</del><ins>+ return ConsoleObject::create(vm, global, ConsoleObject::createStructure(vm, global, constructEmptyObject(global->globalExec())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>
</body>
</html>