<!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>[183754] trunk/Source/JavaScriptCore</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/183754">183754</a></dd>
<dt>Author</dt> <dd>saambarati1@gmail.com</dd>
<dt>Date</dt> <dd>2015-05-04 11:47:33 -0700 (Mon, 04 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSCallbackObject does not maintain symmetry between accesses for getOwnPropertySlot and put
https://bugs.webkit.org/show_bug.cgi?id=144265
Reviewed by Geoffrey Garen.
JSCallbackObject will defer to a parent's implementation of getOwnPropertySlot
for a static function if the parent has that property slot. JSCallbackObject::put
did not maintain this symmetry of also calling ::put on the parent if the parent
has the property. We should ensure that this symmetry exists.
* API/JSCallbackObjectFunctions.h:
(JSC::JSCallbackObject<Parent>::put):
* API/tests/testapi.c:
* API/tests/testapi.js:
(globalStaticFunction2):
(this.globalStaticFunction2):
(iAmNotAStaticFunction):
(this.iAmNotAStaticFunction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSCallbackObjectFunctionsh">trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIteststestapic">trunk/Source/JavaScriptCore/API/tests/testapi.c</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIteststestapijs">trunk/Source/JavaScriptCore/API/tests/testapi.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSCallbackObjectFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h (183753 => 183754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h 2015-05-04 18:45:40 UTC (rev 183753)
+++ trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h 2015-05-04 18:47:33 UTC (rev 183754)
</span><span class="lines">@@ -270,6 +270,9 @@
</span><span class="cx">
</span><span class="cx"> if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
</span><span class="cx"> if (StaticFunctionEntry* entry = staticFunctions->get(name)) {
</span><ins>+ PropertySlot getSlot(thisObject);
+ if (Parent::getOwnPropertySlot(thisObject, exec, propertyName, getSlot))
+ return Parent::put(thisObject, exec, propertyName, value, slot);
</ins><span class="cx"> if (entry->attributes & kJSPropertyAttributeReadOnly)
</span><span class="cx"> return;
</span><span class="cx"> thisObject->JSCallbackObject<Parent>::putDirect(exec->vm(), propertyName, value); // put as override property
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIteststestapic"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/testapi.c (183753 => 183754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/testapi.c 2015-05-04 18:45:40 UTC (rev 183753)
+++ trunk/Source/JavaScriptCore/API/tests/testapi.c 2015-05-04 18:47:33 UTC (rev 183754)
</span><span class="lines">@@ -960,6 +960,7 @@
</span><span class="cx">
</span><span class="cx"> static JSStaticFunction globalObject_staticFunctions[] = {
</span><span class="cx"> { "globalStaticFunction", globalObject_call, kJSPropertyAttributeNone },
</span><ins>+ { "globalStaticFunction2", globalObject_call, kJSPropertyAttributeNone },
</ins><span class="cx"> { "gc", functionGC, kJSPropertyAttributeNone },
</span><span class="cx"> { 0, 0, 0 }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIteststestapijs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/testapi.js (183753 => 183754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/testapi.js 2015-05-04 18:45:40 UTC (rev 183753)
+++ trunk/Source/JavaScriptCore/API/tests/testapi.js 2015-05-04 18:47:33 UTC (rev 183754)
</span><span class="lines">@@ -74,7 +74,21 @@
</span><span class="cx">
</span><span class="cx"> shouldBe("globalStaticValue", 3);
</span><span class="cx"> shouldBe("globalStaticFunction()", 4);
</span><ins>+shouldBe("this.globalStaticFunction()", 4);
</ins><span class="cx">
</span><ins>+function globalStaticFunction2() {
+ return 10;
+}
+shouldBe("globalStaticFunction2();", 10);
+this.globalStaticFunction2 = function() { return 20; }
+shouldBe("globalStaticFunction2();", 20);
+shouldBe("this.globalStaticFunction2();", 20);
+
+function iAmNotAStaticFunction() { return 10; }
+shouldBe("iAmNotAStaticFunction();", 10);
+this.iAmNotAStaticFunction = function() { return 20; }
+shouldBe("iAmNotAStaticFunction();", 20);
+
</ins><span class="cx"> shouldBe("typeof MyObject", "function"); // our object implements 'call'
</span><span class="cx"> MyObject.cantFind = 1;
</span><span class="cx"> shouldBe("MyObject.cantFind", undefined);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183753 => 183754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-04 18:45:40 UTC (rev 183753)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-04 18:47:33 UTC (rev 183754)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-05-04 Saam Barati <saambarati1@gmail.com>
+
+ JSCallbackObject does not maintain symmetry between accesses for getOwnPropertySlot and put
+ https://bugs.webkit.org/show_bug.cgi?id=144265
+
+ Reviewed by Geoffrey Garen.
+
+ JSCallbackObject will defer to a parent's implementation of getOwnPropertySlot
+ for a static function if the parent has that property slot. JSCallbackObject::put
+ did not maintain this symmetry of also calling ::put on the parent if the parent
+ has the property. We should ensure that this symmetry exists.
+
+ * API/JSCallbackObjectFunctions.h:
+ (JSC::JSCallbackObject<Parent>::put):
+ * API/tests/testapi.c:
+ * API/tests/testapi.js:
+ (globalStaticFunction2):
+ (this.globalStaticFunction2):
+ (iAmNotAStaticFunction):
+ (this.iAmNotAStaticFunction):
+
</ins><span class="cx"> 2015-05-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Make ExecState::vm() branchless in release builds.
</span></span></pre>
</div>
</div>
</body>
</html>