<!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>[202666] 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/202666">202666</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-29 21:19:42 -0700 (Wed, 29 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: API View of Native DOM APIs looks poor (TypeErrors for native getters)
https://bugs.webkit.org/show_bug.cgi?id=158334
<rdar://problem/26615366>
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/InjectedScriptSource.js:
(InjectedScript.prototype._getProperties):
(InjectedScript.prototype._propertyDescriptors):
Do not create fake value property descriptors for native accessors
unless requested. This means, getProperties for a native prototype
should return accessors for native accessors just like it does
for normal non-native accessors (getters/setters).
(InjectedScript.prototype.getProperties):
Do not produce fake value accessors for native accessors.
(InjectedScript.prototype.getDisplayableProperties):
(InjectedScript.RemoteObject.prototype._generatePreview):
Do produce fake value accessors for native accessors.
LayoutTests:
* inspector/runtime/getProperties-expected.txt:
* inspector/runtime/getProperties.html:
Improve output for accessors now that getProperties
returns real accessor descriptors for native accessors
instead of fake value descriptors.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorruntimegetPropertiesexpectedtxt">trunk/LayoutTests/inspector/runtime/getProperties-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorruntimegetPropertieshtml">trunk/LayoutTests/inspector/runtime/getProperties.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202665 => 202666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-30 04:17:33 UTC (rev 202665)
+++ trunk/LayoutTests/ChangeLog 2016-06-30 04:19:42 UTC (rev 202666)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-06-29 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: API View of Native DOM APIs looks poor (TypeErrors for native getters)
+ https://bugs.webkit.org/show_bug.cgi?id=158334
+ <rdar://problem/26615366>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/runtime/getProperties-expected.txt:
+ * inspector/runtime/getProperties.html:
+ Improve output for accessors now that getProperties
+ returns real accessor descriptors for native accessors
+ instead of fake value descriptors.
+
+2016-06-29 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Wrong function name next to scope
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158210
</span><span class="cx"> <rdar://problem/26543093>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorruntimegetPropertiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/runtime/getProperties-expected.txt (202665 => 202666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/runtime/getProperties-expected.txt 2016-06-30 04:17:33 UTC (rev 202665)
+++ trunk/LayoutTests/inspector/runtime/getProperties-expected.txt 2016-06-30 04:19:42 UTC (rev 202666)
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx"> __proto__ function function () {
</span><span class="cx"> [native code]
</span><span class="cx"> }
</span><del>- arguments object TypeError: 'arguments', 'callee', and 'caller' cannot be accessed in strict mode.
- caller object TypeError: 'arguments', 'callee', and 'caller' cannot be accessed in strict mode.
</del><ins>+ arguments getter setter
+ caller getter setter
</ins><span class="cx"> length number 0
</span><span class="cx"> name string bound Number
</span><span class="cx"> Internal properties:
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> __proto__ function function () {
</span><span class="cx"> [native code]
</span><span class="cx"> }
</span><del>- arguments object TypeError: 'arguments', 'callee', and 'caller' cannot be accessed in strict mode.
- caller object TypeError: 'arguments', 'callee', and 'caller' cannot be accessed in strict mode.
</del><ins>+ arguments getter setter
+ caller getter setter
</ins><span class="cx"> length number 0
</span><span class="cx"> name string bound
</span><span class="cx"> Internal properties:
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorruntimegetPropertieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/runtime/getProperties.html (202665 => 202666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/runtime/getProperties.html 2016-06-30 04:17:33 UTC (rev 202665)
+++ trunk/LayoutTests/inspector/runtime/getProperties.html 2016-06-30 04:19:42 UTC (rev 202666)
</span><span class="lines">@@ -80,11 +80,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function dumpSingleProperty(property) {
</span><del>- var {name, value} = property;
</del><ins>+ var {name, value, get, set} = property;
</ins><span class="cx"> if (value)
</span><del>- ProtocolTest.log(" " + name + " " + value.type + " " + (value.value || value.description));
</del><ins>+ ProtocolTest.log(` ${name} ${value.type} ${value.value || value.description}`);
+ else if (get || set)
+ ProtocolTest.log(` ${name} ${get ? "getter" : "-"} ${set ? "setter" : ""}`);
</ins><span class="cx"> else
</span><del>- ProtocolTest.log(" " + name);
</del><ins>+ ProtocolTest.log(` ${name}`);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function NamedThingComparator(o1, o2) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202665 => 202666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-30 04:17:33 UTC (rev 202665)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-30 04:19:42 UTC (rev 202666)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-06-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: API View of Native DOM APIs looks poor (TypeErrors for native getters)
+ https://bugs.webkit.org/show_bug.cgi?id=158334
+ <rdar://problem/26615366>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InjectedScriptSource.js:
+ (InjectedScript.prototype._getProperties):
+ (InjectedScript.prototype._propertyDescriptors):
+ Do not create fake value property descriptors for native accessors
+ unless requested. This means, getProperties for a native prototype
+ should return accessors for native accessors just like it does
+ for normal non-native accessors (getters/setters).
+
+ (InjectedScript.prototype.getProperties):
+ Do not produce fake value accessors for native accessors.
+
+ (InjectedScript.prototype.getDisplayableProperties):
+ (InjectedScript.RemoteObject.prototype._generatePreview):
+ Do produce fake value accessors for native accessors.
+
</ins><span class="cx"> 2016-06-29 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> JSGlobalLexicalEnvironment needs a toThis implementation
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (202665 => 202666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-06-30 04:17:33 UTC (rev 202665)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-06-30 04:19:42 UTC (rev 202666)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _getProperties: function(objectId, collectionMode, generatePreview)
</del><ins>+ _getProperties: function(objectId, collectionMode, generatePreview, nativeGettersAsValues)
</ins><span class="cx"> {
</span><span class="cx"> var parsedObjectId = this._parseObjectId(objectId);
</span><span class="cx"> var object = this._objectForId(parsedObjectId);
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> if (isSymbol(object))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- var descriptors = this._propertyDescriptors(object, collectionMode);
</del><ins>+ var descriptors = this._propertyDescriptors(object, collectionMode, nativeGettersAsValues);
</ins><span class="cx">
</span><span class="cx"> // Go over properties, wrap object values.
</span><span class="cx"> for (var i = 0; i < descriptors.length; ++i) {
</span><span class="lines">@@ -287,14 +287,16 @@
</span><span class="cx">
</span><span class="cx"> getProperties: function(objectId, ownProperties, generatePreview)
</span><span class="cx"> {
</span><ins>+ var nativeGettersAsValues = false;
</ins><span class="cx"> var collectionMode = ownProperties ? InjectedScript.CollectionMode.OwnProperties : InjectedScript.CollectionMode.AllProperties;
</span><del>- return this._getProperties(objectId, collectionMode, generatePreview);
</del><ins>+ return this._getProperties(objectId, collectionMode, generatePreview, nativeGettersAsValues);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getDisplayableProperties: function(objectId, generatePreview)
</span><span class="cx"> {
</span><ins>+ var nativeGettersAsValues = true;
</ins><span class="cx"> var collectionMode = InjectedScript.CollectionMode.OwnProperties | InjectedScript.CollectionMode.NativeGetterProperties;
</span><del>- return this._getProperties(objectId, collectionMode, generatePreview);
</del><ins>+ return this._getProperties(objectId, collectionMode, generatePreview, nativeGettersAsValues);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getInternalProperties: function(objectId, generatePreview)
</span><span class="lines">@@ -570,7 +572,7 @@
</span><span class="cx"> return descriptors;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _propertyDescriptors: function(object, collectionMode)
</del><ins>+ _propertyDescriptors: function(object, collectionMode, nativeGettersAsValues)
</ins><span class="cx"> {
</span><span class="cx"> var descriptors = [];
</span><span class="cx"> var nameProcessed = new Set;
</span><span class="lines">@@ -612,11 +614,7 @@
</span><span class="cx">
</span><span class="cx"> // Native Getter properties.
</span><span class="cx"> if (collectionMode & InjectedScript.CollectionMode.NativeGetterProperties) {
</span><del>- // FIXME: <https://webkit.org/b/140575> Web Inspector: Native Bindings Descriptors are Incomplete
- // if (descriptor.hasOwnProperty("get") && descriptor.get && isNativeFunction(descriptor.get)) { ... }
-
</del><span class="cx"> if (possibleNativeBindingGetter) {
</span><del>- // Possible getter property in the prototype chain.
</del><span class="cx"> descriptors.push(descriptor);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -644,15 +642,14 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (endsWith(String(descriptor.get), "[native code]\n}") ||
- (!descriptor.get && descriptor.hasOwnProperty("get") && !descriptor.set && descriptor.hasOwnProperty("set"))) {
- // FIXME: Some Native Bindings Descriptors are Incomplete
- // <https://webkit.org/b/141585> Some IDL attributes appear on the instances instead of on prototypes
- // Developers may create such a descriptors, so we should be resilient:
- // var x = {}; Object.defineProperty(x, "p", {get:undefined}); Object.getOwnPropertyDescriptor(x, "p")
- var fakeDescriptor = createFakeValueDescriptor(name, symbol, descriptor, isOwnProperty, true);
- processDescriptor(fakeDescriptor, isOwnProperty, true);
- continue;
</del><ins>+ if (nativeGettersAsValues) {
+ if (endsWith(String(descriptor.get), "[native code]\n}") || (!descriptor.get && descriptor.hasOwnProperty("get") && !descriptor.set && descriptor.hasOwnProperty("set"))) {
+ // Developers may create such a descriptor, so we should be resilient:
+ // var x = {}; Object.defineProperty(x, "p", {get:undefined}); Object.getOwnPropertyDescriptor(x, "p")
+ var fakeDescriptor = createFakeValueDescriptor(name, symbol, descriptor, isOwnProperty, true);
+ processDescriptor(fakeDescriptor, isOwnProperty, true);
+ continue;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> descriptor.name = name;
</span><span class="lines">@@ -1043,7 +1040,8 @@
</span><span class="cx"> return preview;
</span><span class="cx">
</span><span class="cx"> // Properties.
</span><del>- var descriptors = injectedScript._propertyDescriptors(object, InjectedScript.CollectionMode.AllProperties);
</del><ins>+ var nativeGettersAsValues = true;
+ var descriptors = injectedScript._propertyDescriptors(object, InjectedScript.CollectionMode.AllProperties, nativeGettersAsValues);
</ins><span class="cx"> this._appendPropertyPreviews(object, preview, descriptors, false, propertiesThreshold, firstLevelKeys, secondLevelKeys);
</span><span class="cx"> if (propertiesThreshold.indexes < 0 || propertiesThreshold.properties < 0)
</span><span class="cx"> return preview;
</span></span></pre>
</div>
</div>
</body>
</html>