<!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>[197061] 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/197061">197061</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-24 20:59:18 -0800 (Wed, 24 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Expose Proxy target and handler internal properties to Inspector
https://bugs.webkit.org/show_bug.cgi?id=154663
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-02-24
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::getInternalProperties):
Expose the ProxyObject's target and handler.
Source/WebInspectorUI:
* UserInterface/Models/NativeFunctionParameters.js:
* UserInterface/Views/ObjectTreePropertyTreeElement.js:
(WebInspector.ObjectTreePropertyTreeElement.prototype._functionParameterString):
Improve the native parameter list for the global Reflect object methods.
Include "enumerate" even though it is deprecated, because we implement it.
LayoutTests:
* inspector/model/remote-object.html:
* platform/mac/inspector/model/remote-object-expected.txt:
Test that a Proxy object includes the internal properties.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectexpectedtxt">trunk/LayoutTests/inspector/model/remote-object-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjecthtml">trunk/LayoutTests/inspector/model/remote-object.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacinspectormodelremoteobjectexpectedtxt">trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsNativeFunctionParametersjs">trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreePropertyTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197060 => 197061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-25 02:39:19 UTC (rev 197060)
+++ trunk/LayoutTests/ChangeLog 2016-02-25 04:59:18 UTC (rev 197061)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-02-24 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Expose Proxy target and handler internal properties to Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=154663
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/model/remote-object.html:
+ * platform/mac/inspector/model/remote-object-expected.txt:
+ Test that a Proxy object includes the internal properties.
+
</ins><span class="cx"> 2016-02-24 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking storage/indexeddb/odd-strings.html as flaky on mac-wk1
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-expected.txt (197060 => 197061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-expected.txt 2016-02-25 02:39:19 UTC (rev 197060)
+++ trunk/LayoutTests/inspector/model/remote-object-expected.txt 2016-02-25 04:59:18 UTC (rev 197061)
</span><span class="lines">@@ -4656,6 +4656,74 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -----------------------------------------------------
</span><ins>+EXPRESSION: new Proxy({x:1, y:1}, {handler: true})
+{
+ "_type": "object",
+ "_objectId": "<filtered>",
+ "_description": "ProxyObject",
+ "_preview": {
+ "_listeners": null,
+ "_type": "object",
+ "_description": "ProxyObject",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "target",
+ "_type": "object",
+ "_valuePreview": {
+ "_listeners": null,
+ "_type": "object",
+ "_description": "Object",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "x",
+ "_type": "number",
+ "_value": "1"
+ },
+ {
+ "_listeners": null,
+ "_name": "y",
+ "_type": "number",
+ "_value": "1"
+ }
+ ],
+ "_entries": null
+ },
+ "_internal": true
+ },
+ {
+ "_listeners": null,
+ "_name": "handler",
+ "_type": "object",
+ "_valuePreview": {
+ "_listeners": null,
+ "_type": "object",
+ "_description": "Object",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "handler",
+ "_type": "boolean",
+ "_value": "true"
+ }
+ ],
+ "_entries": null
+ },
+ "_internal": true
+ }
+ ],
+ "_entries": null
+ }
+}
+
+-----------------------------------------------------
</ins><span class="cx"> EXPRESSION: Person = class Person { constructor(name){} get fullName(){} methodName(p1, p2){} }; Person
</span><span class="cx"> {
</span><span class="cx"> "_type": "function",
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object.html (197060 => 197061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object.html 2016-02-25 02:39:19 UTC (rev 197060)
+++ trunk/LayoutTests/inspector/model/remote-object.html 2016-02-25 04:59:18 UTC (rev 197061)
</span><span class="lines">@@ -168,6 +168,9 @@
</span><span class="cx"> {expression: "Promise.resolve()"},
</span><span class="cx"> {expression: "Promise.resolve({result:1})"},
</span><span class="cx">
</span><ins>+ // Proxy
+ {expression: "new Proxy({x:1, y:1}, {handler: true})"},
+
</ins><span class="cx"> // Classes
</span><span class="cx">
</span><span class="cx"> {expression: "Person = class Person { constructor(name){} get fullName(){} methodName(p1, p2){} }; Person"}, // Constructor => class type
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt (197060 => 197061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt 2016-02-25 02:39:19 UTC (rev 197060)
+++ trunk/LayoutTests/platform/mac/inspector/model/remote-object-expected.txt 2016-02-25 04:59:18 UTC (rev 197061)
</span><span class="lines">@@ -4657,6 +4657,74 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -----------------------------------------------------
</span><ins>+EXPRESSION: new Proxy({x:1, y:1}, {handler: true})
+{
+ "_type": "object",
+ "_objectId": "<filtered>",
+ "_description": "ProxyObject",
+ "_preview": {
+ "_listeners": null,
+ "_type": "object",
+ "_description": "ProxyObject",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "target",
+ "_type": "object",
+ "_valuePreview": {
+ "_listeners": null,
+ "_type": "object",
+ "_description": "Object",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "x",
+ "_type": "number",
+ "_value": "1"
+ },
+ {
+ "_listeners": null,
+ "_name": "y",
+ "_type": "number",
+ "_value": "1"
+ }
+ ],
+ "_entries": null
+ },
+ "_internal": true
+ },
+ {
+ "_listeners": null,
+ "_name": "handler",
+ "_type": "object",
+ "_valuePreview": {
+ "_listeners": null,
+ "_type": "object",
+ "_description": "Object",
+ "_lossless": true,
+ "_overflow": false,
+ "_properties": [
+ {
+ "_listeners": null,
+ "_name": "handler",
+ "_type": "boolean",
+ "_value": "true"
+ }
+ ],
+ "_entries": null
+ },
+ "_internal": true
+ }
+ ],
+ "_entries": null
+ }
+}
+
+-----------------------------------------------------
</ins><span class="cx"> EXPRESSION: Person = class Person { constructor(name){} get fullName(){} methodName(p1, p2){} }; Person
</span><span class="cx"> {
</span><span class="cx"> "_type": "function",
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197060 => 197061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-25 02:39:19 UTC (rev 197060)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-25 04:59:18 UTC (rev 197061)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-02-24 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Expose Proxy target and handler internal properties to Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=154663
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::getInternalProperties):
+ Expose the ProxyObject's target and handler.
+
</ins><span class="cx"> 2016-02-24 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
</span><span class="cx">
</span><span class="cx"> [web-animations] Add AnimationTimeline, DocumentTimeline and add extensions to Document interface
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp (197060 => 197061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-02-25 02:39:19 UTC (rev 197060)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-02-25 04:59:18 UTC (rev 197061)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #include "JSWeakMap.h"
</span><span class="cx"> #include "JSWeakSet.h"
</span><span class="cx"> #include "ObjectConstructor.h"
</span><ins>+#include "ProxyObject.h"
</ins><span class="cx"> #include "RegExpObject.h"
</span><span class="cx"> #include "ScopedArguments.h"
</span><span class="cx"> #include "SourceCode.h"
</span><span class="lines">@@ -260,6 +261,14 @@
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (ProxyObject* proxy = jsDynamicCast<ProxyObject*>(value)) {
+ unsigned index = 0;
+ JSArray* array = constructEmptyArray(exec, nullptr, 2);
+ array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("target"), proxy->target()));
+ array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("handler"), proxy->handler()));
+ return array;
+ }
+
</ins><span class="cx"> if (JSArrayIterator* arrayIterator = jsDynamicCast<JSArrayIterator*>(value)) {
</span><span class="cx"> String kind;
</span><span class="cx"> switch (arrayIterator->kind(exec)) {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (197060 => 197061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-02-25 02:39:19 UTC (rev 197060)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-02-25 04:59:18 UTC (rev 197061)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-02-24 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Expose Proxy target and handler internal properties to Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=154663
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/NativeFunctionParameters.js:
+ * UserInterface/Views/ObjectTreePropertyTreeElement.js:
+ (WebInspector.ObjectTreePropertyTreeElement.prototype._functionParameterString):
+ Improve the native parameter list for the global Reflect object methods.
+ Include "enumerate" even though it is deprecated, because we implement it.
+
</ins><span class="cx"> 2016-02-24 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Visual Styles sidebar should support multiple animations
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsNativeFunctionParametersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js (197060 => 197061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js 2016-02-25 02:39:19 UTC (rev 197060)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js 2016-02-25 04:59:18 UTC (rev 197061)
</span><span class="lines">@@ -129,6 +129,24 @@
</span><span class="cx"> __proto__: null,
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ Reflect: {
+ apply: "target, thisArgument, argumentsList",
+ construct: "target, argumentsList, [newTarget=target]",
+ defineProperty: "target, propertyKey, attributes",
+ deleteProperty: "target, propertyKey",
+ enumerate: "target",
+ get: "target, propertyKey, [receiver]",
+ getOwnPropertyDescriptor: "target, propertyKey",
+ getPrototypeOf: "target",
+ has: "target, propertyKey",
+ isExtensible: "target",
+ ownKeys: "target",
+ preventExtensions: "target",
+ set: "target, propertyKey, value, [receiver]",
+ setPrototypeOf: "target, prototype",
+ __proto__: null,
+ },
+
</ins><span class="cx"> String: {
</span><span class="cx"> fromCharCode: "...codeUnits",
</span><span class="cx"> fromCodePoint: "...codePoints",
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreePropertyTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js (197060 => 197061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js 2016-02-25 02:39:19 UTC (rev 197060)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js 2016-02-25 04:59:18 UTC (rev 197061)
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Native DOM constructor or on native objects that are not functions.
</span><del>- if (parentDescription.endsWith("Constructor") || parentDescription === "Math" || parentDescription === "JSON") {
</del><ins>+ if (parentDescription.endsWith("Constructor") || parentDescription === "Math" || parentDescription === "JSON" || parentDescription === "Reflect") {
</ins><span class="cx"> var name = parentDescription;
</span><span class="cx"> if (WebInspector.NativeConstructorFunctionParameters[name]) {
</span><span class="cx"> var params = WebInspector.NativeConstructorFunctionParameters[name][this._property.name];
</span></span></pre>
</div>
</div>
</body>
</html>