<!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>[179505] branches/safari-600.5-branch/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/179505">179505</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-02 15:42:00 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/178730">r178730</a>. rdar://problem/19670732</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreAPIJSObjectRefcpp">branches/safari-600.5-branch/Source/JavaScriptCore/API/JSObjectRef.cpp</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreAPIJSWeakObjectMapRefPrivatecpp">branches/safari-600.5-branch/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreAPItestsCustomGlobalObjectClassTestc">branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.c</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreAPItestsCustomGlobalObjectClassTesth">branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.h</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreAPIteststestapic">branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/testapi.c</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreChangeLog">branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceJavaScriptCoreAPIJSObjectRefcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/API/JSObjectRef.cpp (179504 => 179505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/API/JSObjectRef.cpp 2015-02-02 23:36:45 UTC (rev 179504)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/API/JSObjectRef.cpp 2015-02-02 23:42:00 UTC (rev 179505)
</span><span class="lines">@@ -302,6 +302,14 @@
</span><span class="cx"> JSObject* jsObject = toJS(object);
</span><span class="cx"> JSValue jsValue = toJS(exec, value);
</span><span class="cx">
</span><ins>+ if (JSProxy* proxy = jsDynamicCast<JSProxy*>(jsObject)) {
+ if (JSGlobalObject* globalObject = jsDynamicCast<JSGlobalObject*>(proxy->target())) {
+ globalObject->resetPrototype(exec->vm(), jsValue.isObject() ? jsValue : jsNull());
+ return;
+ }
+ // Someday we might use proxies for something other than JSGlobalObjects, but today is not that day.
+ RELEASE_ASSERT_NOT_REACHED();
+ }
</ins><span class="cx"> jsObject->setPrototypeWithCycleCheck(exec, jsValue.isObject() ? jsValue : jsNull());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -501,6 +509,11 @@
</span><span class="cx"> JSObject* jsObject = toJS(object);
</span><span class="cx"> JSValue result;
</span><span class="cx"> Identifier name(propertyName->identifier(&exec->vm()));
</span><ins>+
+ // Get wrapped object if proxied
+ if (jsObject->inherits(JSProxy::info()))
+ jsObject = jsCast<JSProxy*>(jsObject)->target();
+
</ins><span class="cx"> if (jsObject->inherits(JSCallbackObject<JSGlobalObject>::info()))
</span><span class="cx"> result = jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->getPrivateProperty(name);
</span><span class="cx"> else if (jsObject->inherits(JSCallbackObject<JSDestructibleObject>::info()))
</span><span class="lines">@@ -519,6 +532,11 @@
</span><span class="cx"> JSObject* jsObject = toJS(object);
</span><span class="cx"> JSValue jsValue = value ? toJS(exec, value) : JSValue();
</span><span class="cx"> Identifier name(propertyName->identifier(&exec->vm()));
</span><ins>+
+ // Get wrapped object if proxied
+ if (jsObject->inherits(JSProxy::info()))
+ jsObject = jsCast<JSProxy*>(jsObject)->target();
+
</ins><span class="cx"> if (jsObject->inherits(JSCallbackObject<JSGlobalObject>::info())) {
</span><span class="cx"> jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->setPrivateProperty(exec->vm(), name, jsValue);
</span><span class="cx"> return true;
</span><span class="lines">@@ -542,6 +560,11 @@
</span><span class="cx"> JSLockHolder locker(exec);
</span><span class="cx"> JSObject* jsObject = toJS(object);
</span><span class="cx"> Identifier name(propertyName->identifier(&exec->vm()));
</span><ins>+
+ // Get wrapped object if proxied
+ if (jsObject->inherits(JSProxy::info()))
+ jsObject = jsCast<JSProxy*>(jsObject)->target();
+
</ins><span class="cx"> if (jsObject->inherits(JSCallbackObject<JSGlobalObject>::info())) {
</span><span class="cx"> jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->deletePrivateProperty(name);
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoreAPIJSWeakObjectMapRefPrivatecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp (179504 => 179505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp 2015-02-02 23:36:45 UTC (rev 179504)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp 2015-02-02 23:42:00 UTC (rev 179505)
</span><span class="lines">@@ -62,7 +62,9 @@
</span><span class="cx"> JSObject* obj = toJS(object);
</span><span class="cx"> if (!obj)
</span><span class="cx"> return;
</span><del>- ASSERT(obj->inherits(JSCallbackObject<JSGlobalObject>::info()) || obj->inherits(JSCallbackObject<JSDestructibleObject>::info()));
</del><ins>+ ASSERT(obj->inherits(JSProxy::info())
+ || obj->inherits(JSCallbackObject<JSGlobalObject>::info())
+ || obj->inherits(JSCallbackObject<JSDestructibleObject>::info()));
</ins><span class="cx"> map->map().set(key, obj);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoreAPItestsCustomGlobalObjectClassTestc"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.c (179504 => 179505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.c 2015-02-02 23:36:45 UTC (rev 179504)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.c 2015-02-02 23:42:00 UTC (rev 179505)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CustomGlobalObjectClassTest.h"
</span><span class="cx">
</span><ins>+#include <JavaScriptCore/JSObjectRefPrivate.h>
</ins><span class="cx"> #include <JavaScriptCore/JavaScriptCore.h>
</span><span class="cx"> #include <stdio.h>
</span><span class="cx">
</span><span class="lines">@@ -98,3 +99,47 @@
</span><span class="cx">
</span><span class="cx"> assertTrue(executedCallback, "Executed custom global object callback");
</span><span class="cx"> }
</span><ins>+
+void globalObjectSetPrototypeTest()
+{
+ JSClassDefinition definition = kJSClassDefinitionEmpty;
+ definition.className = "Global";
+ JSClassRef global = JSClassCreate(&definition);
+ JSGlobalContextRef context = JSGlobalContextCreate(global);
+ JSObjectRef object = JSContextGetGlobalObject(context);
+
+ JSObjectRef above = JSObjectMake(context, 0, 0);
+ JSStringRef test = JSStringCreateWithUTF8CString("test");
+ JSValueRef value = JSValueMakeString(context, test);
+ JSObjectSetProperty(context, above, test, value, kJSPropertyAttributeDontEnum, 0);
+
+ JSObjectSetPrototype(context, object, above);
+ JSStringRef script = JSStringCreateWithUTF8CString("test === \"test\"");
+ JSValueRef result = JSEvaluateScript(context, script, 0, 0, 0, 0);
+
+ assertTrue(JSValueToBoolean(context, result), "test === \"test\"");
+
+ JSStringRelease(test);
+ JSStringRelease(script);
+}
+
+void globalObjectPrivatePropertyTest()
+{
+ JSClassDefinition definition = kJSClassDefinitionEmpty;
+ definition.className = "Global";
+ JSClassRef global = JSClassCreate(&definition);
+ JSGlobalContextRef context = JSGlobalContextCreate(global);
+ JSObjectRef globalObject = JSContextGetGlobalObject(context);
+
+ JSStringRef privateName = JSStringCreateWithUTF8CString("private");
+ JSValueRef privateValue = JSValueMakeString(context, privateName);
+ assertTrue(JSObjectSetPrivateProperty(context, globalObject, privateName, privateValue), "JSObjectSetPrivateProperty succeeded");
+ JSValueRef result = JSObjectGetPrivateProperty(context, globalObject, privateName);
+ assertTrue(JSValueIsStrictEqual(context, privateValue, result), "privateValue === \"private\"");
+
+ assertTrue(JSObjectDeletePrivateProperty(context, globalObject, privateName), "JSObjectDeletePrivateProperty succeeded");
+ result = JSObjectGetPrivateProperty(context, globalObject, privateName);
+ assertTrue(JSValueIsNull(context, result), "Deleted private property is indeed no longer present");
+
+ JSStringRelease(privateName);
+}
</ins></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoreAPItestsCustomGlobalObjectClassTesth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.h (179504 => 179505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.h 2015-02-02 23:36:45 UTC (rev 179504)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.h 2015-02-02 23:42:00 UTC (rev 179505)
</span><span class="lines">@@ -27,5 +27,7 @@
</span><span class="cx"> #define CustomGlobalObjectClassTest_h
</span><span class="cx">
</span><span class="cx"> void customGlobalObjectClassTest(void);
</span><ins>+void globalObjectSetPrototypeTest(void);
+void globalObjectPrivatePropertyTest(void);
</ins><span class="cx">
</span><span class="cx"> #endif // CustomGlobalObjectClassTest_h
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoreAPIteststestapic"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/testapi.c (179504 => 179505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/testapi.c 2015-02-02 23:36:45 UTC (rev 179504)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/API/tests/testapi.c 2015-02-02 23:42:00 UTC (rev 179505)
</span><span class="lines">@@ -2079,6 +2079,8 @@
</span><span class="cx"> printf("PASS: global context name behaves as expected.\n");
</span><span class="cx">
</span><span class="cx"> customGlobalObjectClassTest();
</span><ins>+ globalObjectSetPrototypeTest();
+ globalObjectPrivatePropertyTest();
</ins><span class="cx">
</span><span class="cx"> if (failed) {
</span><span class="cx"> printf("FAIL: Some tests failed.\n");
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog (179504 => 179505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog 2015-02-02 23:36:45 UTC (rev 179504)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog 2015-02-02 23:42:00 UTC (rev 179505)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r171691.
+
+ 2014-07-28 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ REGRESSION: JSObjectSetPrototype() does not work on result of JSGetGlobalObject()
+ https://bugs.webkit.org/show_bug.cgi?id=135322
+
+ Reviewed by Oliver Hunt.
+
+ The prototype chain of the JSProxy object should match that of the JSGlobalObject.
+
+ This is a separate but related issue with JSObjectSetPrototype which doesn't correctly
+ account for JSProxies. I also audited the rest of the C API to check that we correctly
+ handle JSProxies in all other situations where we expect a JSCallbackObject of some sort
+ and found some SPI calls (JSObject*PrivateProperty) that didn't behave correctly when
+ passed a JSProxy.
+
+ I also added some new tests for these cases.
+
+ * API/JSObjectRef.cpp:
+ (JSObjectSetPrototype):
+ (JSObjectGetPrivateProperty):
+ (JSObjectSetPrivateProperty):
+ (JSObjectDeletePrivateProperty):
+ * API/JSWeakObjectMapRefPrivate.cpp:
+ * API/tests/CustomGlobalObjectClassTest.c:
+ (globalObjectSetPrototypeTest):
+ (globalObjectPrivatePropertyTest):
+ * API/tests/CustomGlobalObjectClassTest.h:
+ * API/tests/testapi.c:
+ (main):
+
</ins><span class="cx"> 2015-01-28 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r178768. rdar://problem/19617631
</span></span></pre>
</div>
</div>
</body>
</html>