<!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>[237571] 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/237571">237571</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2018-10-29 16:29:13 -0700 (Mon, 29 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: refactor code for getting properties via WI.RemoteObject
https://bugs.webkit.org/show_bug.cgi?id=190989

Reviewed by Matt Baker.

Source/WebInspectorUI:

* UserInterface/Protocol/RemoteObject.js:
(WI.RemoteObject.prototype.getPropertyDescriptors): Added.
(WI.RemoteObject.prototype.getPropertyDescriptorsAsObject): Added.
(WI.RemoteObject.prototype.getOwnPropertyDescriptors): Deleted.
(WI.RemoteObject.prototype.getAllPropertyDescriptors): Deleted.
(WI.RemoteObject.prototype._getPropertyDescriptors): Deleted.
(WI.RemoteObject.prototype.getOwnPropertyDescriptorsAsObject): Deleted.

* UserInterface/Views/ErrorObjectView.js:
(WI.ErrorObjectView.prototype.update):
* UserInterface/Views/ObjectTreePropertyTreeElement.js:
(WI.ObjectTreePropertyTreeElement.prototype._updateChildren):
* UserInterface/Views/ObjectTreeView.js:
(WI.ObjectTreeView.prototype.update):

LayoutTests:

* http/tests/inspector/paymentrequest/payment-request-internal-properties.https.html:
* inspector/debugger/breakpoint-scope.html:
* inspector/debugger/paused-scopes.html:
* inspector/debugger/tail-deleted-frames-from-vm-entry.html:
* inspector/debugger/tail-deleted-frames.html:
* inspector/debugger/tail-recursion.html:
* inspector/model/remote-object-fake-object.html:
* inspector/model/remote-object-get-properties.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorpaymentrequestpaymentrequestinternalpropertieshttpshtml">trunk/LayoutTests/http/tests/inspector/paymentrequest/payment-request-internal-properties.https.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointscopehtml">trunk/LayoutTests/inspector/debugger/breakpoint-scope.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerpausedscopeshtml">trunk/LayoutTests/inspector/debugger/paused-scopes.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggertaildeletedframesfromvmentryhtml">trunk/LayoutTests/inspector/debugger/tail-deleted-frames-from-vm-entry.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggertaildeletedframeshtml">trunk/LayoutTests/inspector/debugger/tail-deleted-frames.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggertailrecursionhtml">trunk/LayoutTests/inspector/debugger/tail-recursion.html</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectfakeobjecthtml">trunk/LayoutTests/inspector/model/remote-object-fake-object.html</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectgetpropertieshtml">trunk/LayoutTests/inspector/model/remote-object-get-properties.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsErrorObjectViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreePropertyTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/LayoutTests/ChangeLog 2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2018-10-29  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: refactor code for getting properties via WI.RemoteObject
+        https://bugs.webkit.org/show_bug.cgi?id=190989
+
+        Reviewed by Matt Baker.
+
+        * http/tests/inspector/paymentrequest/payment-request-internal-properties.https.html:
+        * inspector/debugger/breakpoint-scope.html:
+        * inspector/debugger/paused-scopes.html:
+        * inspector/debugger/tail-deleted-frames-from-vm-entry.html:
+        * inspector/debugger/tail-deleted-frames.html:
+        * inspector/debugger/tail-recursion.html:
+        * inspector/model/remote-object-fake-object.html:
+        * inspector/model/remote-object-get-properties.html:
+
</ins><span class="cx"> 2018-10-29  Justin Michaud  <justin_michaud@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Revert r237347 registered custom properties... https://bugs.webkit.org/show_bug.cgi?id=190039
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorpaymentrequestpaymentrequestinternalpropertieshttpshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/paymentrequest/payment-request-internal-properties.https.html (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/paymentrequest/payment-request-internal-properties.https.html     2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/LayoutTests/http/tests/inspector/paymentrequest/payment-request-internal-properties.https.html        2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">                     InspectorTest.evaluateInPage(expression, null, {remoteObjectOnly: true}),
</span><span class="cx">                     InspectorTest.awaitEvent("Continue"),
</span><span class="cx">                 ]);
</span><del>-                let [propertyDescriptors] = await promisify((cb) => { remoteObject.getAllPropertyDescriptors(cb); });
</del><ins>+                let [propertyDescriptors] = await promisify((cb) => { remoteObject.getPropertyDescriptors(cb); });
</ins><span class="cx">                 for (let propertyDescriptor of propertyDescriptors.reverse()) {
</span><span class="cx">                     if (propertyDescriptor.isInternalProperty) {
</span><span class="cx">                         let displayString = await propertyDescriptorString(propertyDescriptor);
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointscopehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-scope.html (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-scope.html       2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-scope.html  2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">         for (var scope of scopeChain) {
</span><span class="cx">             scopeTypes.push(scope.type);
</span><span class="cx">             if (scope.type !== WI.ScopeChainNode.Type.Global) {
</span><del>-                scope.objects[0].getAllPropertyDescriptors(function(properties) {
</del><ins>+                scope.objects[0].getPropertyDescriptors(function(properties) {
</ins><span class="cx">                     InspectorTest.log(scopeTypes[scopeTypeIndex++] + " properties:");
</span><span class="cx">                     for (var propertyDescriptor of properties)
</span><span class="cx">                         InspectorTest.log("    " + propertyDescriptor.name);
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerpausedscopeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/paused-scopes.html (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/paused-scopes.html  2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/LayoutTests/inspector/debugger/paused-scopes.html     2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> 
</span><span class="cx">             for (let scopeObject of scope.objects) {
</span><span class="cx">                 promises.push(new Promise((resolve, reject) => {
</span><del>-                    scopeObject.getAllPropertyDescriptors((propertyDescriptors) => {
</del><ins>+                    scopeObject.getPropertyDescriptors((propertyDescriptors) => {
</ins><span class="cx">                         data.properties = data.properties.concat(propertyDescriptors);
</span><span class="cx">                         resolve();
</span><span class="cx">                     });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggertaildeletedframesfromvmentryhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/tail-deleted-frames-from-vm-entry.html (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/tail-deleted-frames-from-vm-entry.html      2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/LayoutTests/inspector/debugger/tail-deleted-frames-from-vm-entry.html 2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">             InspectorTest.expectThat(callFrame.isTailDeleted === expectedFrame.isTailDeleted, `Tail deleted expectation correct: ${callFrame.isTailDeleted}`);
</span><span class="cx">             let scope = callFrame.scopeChain[1];
</span><span class="cx"> 
</span><del>-            scope.objects[0].getAllPropertyDescriptors(function(properties) {
</del><ins>+            scope.objects[0].getPropertyDescriptors(function(properties) {
</ins><span class="cx">                 let found = false;
</span><span class="cx">                 let variableName = expectedFrame.scope[0];
</span><span class="cx">                 let variableValue = expectedFrame.scope[1];
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggertaildeletedframeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/tail-deleted-frames.html (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/tail-deleted-frames.html    2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/LayoutTests/inspector/debugger/tail-deleted-frames.html       2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">             InspectorTest.assert(callFrame.isTailDeleted === expectedFrame.isTailDeleted);
</span><span class="cx">             let topScope = callFrame.scopeChain[0];
</span><span class="cx"> 
</span><del>-            topScope.objects[0].getAllPropertyDescriptors(function(properties) {
</del><ins>+            topScope.objects[0].getPropertyDescriptors(function(properties) {
</ins><span class="cx">                 let found = false;
</span><span class="cx">                 let variableName = expectedFrame.scope[0];
</span><span class="cx">                 let variableValue = expectedFrame.scope[1];
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggertailrecursionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/tail-recursion.html (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/tail-recursion.html 2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/LayoutTests/inspector/debugger/tail-recursion.html    2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">             else
</span><span class="cx">                 InspectorTest.assert(!callFrame.isTailDeleted);
</span><span class="cx"> 
</span><del>-            topScope.objects[0].getAllPropertyDescriptors(function(properties) {
</del><ins>+            topScope.objects[0].getPropertyDescriptors(function(properties) {
</ins><span class="cx">                 let found = false;
</span><span class="cx">                 for (let propertyDescriptor of properties) {
</span><span class="cx">                     if (propertyDescriptor.name === 'i') {
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectfakeobjecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-fake-object.html (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-fake-object.html 2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/LayoutTests/inspector/model/remote-object-fake-object.html    2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -12,9 +12,12 @@
</span><span class="cx">     InspectorTest.expectThat(fakeObject.type === "object" && !fakeObject.subtype, "A fake remote object should have object type.");
</span><span class="cx">     InspectorTest.expectThat(fakeObject !== WI.RemoteObject.createFakeRemoteObject(), "Each fake remote object instance should be unique.");
</span><span class="cx"> 
</span><del>-    fakeObject.getOwnPropertyDescriptors(function(properties) {
</del><ins>+    const options = {
+        ownProperties: true,
+    };
+    fakeObject.getPropertyDescriptors((properties) => {
</ins><span class="cx">         InspectorTest.expectThat(Array.isArray(properties) && !properties.length, "A fake remote object should have an empty list of own properties.");
</span><del>-    });
</del><ins>+    }, options);
</ins><span class="cx"> 
</span><span class="cx">     fakeObject.getDisplayablePropertyDescriptors(function(properties) {
</span><span class="cx">         InspectorTest.expectThat(Array.isArray(properties) && !properties.length, "A fake remote object should have an empty list of displayable properties.");
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectgetpropertieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-get-properties.html (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-get-properties.html      2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/LayoutTests/inspector/model/remote-object-get-properties.html 2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -85,13 +85,17 @@
</span><span class="cx">             if (remoteObject.subtype)
</span><span class="cx">                 InspectorTest.log("subtype: " + remoteObject.subtype);
</span><span class="cx">             InspectorTest.log("description: " + remoteObject.description);
</span><del>-            remoteObject.getOwnPropertyDescriptors(function(properties) {
</del><ins>+
+            const options = {
+                ownProperties: true,
+            };
+            remoteObject.getPropertyDescriptors(function(properties) {
</ins><span class="cx">                 InspectorTest.log("\nOWN PROPERTIES:");
</span><span class="cx">                 for (var property of properties) {
</span><span class="cx">                     InspectorTest.assert(property instanceof WI.PropertyDescriptor);
</span><span class="cx">                     InspectorTest.log("    " + property.name);
</span><span class="cx">                 }
</span><del>-            });
</del><ins>+            }, options);
</ins><span class="cx"> 
</span><span class="cx">             remoteObject.getDisplayablePropertyDescriptors(function(properties) {
</span><span class="cx">                 InspectorTest.log("\nDISPLAYABLE PROPERTIES:");
</span><span class="lines">@@ -101,7 +105,7 @@
</span><span class="cx">                 }
</span><span class="cx">             });
</span><span class="cx"> 
</span><del>-            remoteObject.getAllPropertyDescriptors(function(properties) {
</del><ins>+            remoteObject.getPropertyDescriptors(function(properties) {
</ins><span class="cx">                 InspectorTest.log("\nALL PROPERTIES:");
</span><span class="cx">                 for (var property of properties) {
</span><span class="cx">                     InspectorTest.assert(property instanceof WI.PropertyDescriptor);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/Source/WebInspectorUI/ChangeLog       2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2018-10-29  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: refactor code for getting properties via WI.RemoteObject
+        https://bugs.webkit.org/show_bug.cgi?id=190989
+
+        Reviewed by Matt Baker.
+
+        * UserInterface/Protocol/RemoteObject.js:
+        (WI.RemoteObject.prototype.getPropertyDescriptors): Added.
+        (WI.RemoteObject.prototype.getPropertyDescriptorsAsObject): Added.
+        (WI.RemoteObject.prototype.getOwnPropertyDescriptors): Deleted.
+        (WI.RemoteObject.prototype.getAllPropertyDescriptors): Deleted.
+        (WI.RemoteObject.prototype._getPropertyDescriptors): Deleted.
+        (WI.RemoteObject.prototype.getOwnPropertyDescriptorsAsObject): Deleted.
+
+        * UserInterface/Views/ErrorObjectView.js:
+        (WI.ErrorObjectView.prototype.update):
+        * UserInterface/Views/ObjectTreePropertyTreeElement.js:
+        (WI.ObjectTreePropertyTreeElement.prototype._updateChildren):
+        * UserInterface/Views/ObjectTreeView.js:
+        (WI.ObjectTreeView.prototype.update):
+
</ins><span class="cx"> 2018-10-29  Tim Horton  <timothy_horton@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Modernize WebKit nibs and lprojs for localization's sake
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js       2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js  2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -263,14 +263,14 @@
</span><span class="cx">         });
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    getOwnPropertyDescriptors(callback)
</del><ins>+    getPropertyDescriptors(callback, options = {})
</ins><span class="cx">     {
</span><del>-        this._getPropertyDescriptors(true, callback);
-    }
</del><ins>+        if (!this._objectId || this._isSymbol() || this._isFakeObject()) {
+            callback([]);
+            return;
+        }
</ins><span class="cx"> 
</span><del>-    getAllPropertyDescriptors(callback)
-    {
-        this._getPropertyDescriptors(false, callback);
</del><ins>+        this._target.RuntimeAgent.getProperties(this._objectId, options.ownProperties, options.generatePreview, this._getPropertyDescriptorsResolver.bind(this, callback));
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     getDisplayablePropertyDescriptors(callback)
</span><span class="lines">@@ -651,19 +651,9 @@
</span><span class="cx">         return JSON.stringify(this._objectId) + "-" + this._subtype;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    _getPropertyDescriptors(ownProperties, callback)
</del><ins>+    getPropertyDescriptorsAsObject(callback, options = {})
</ins><span class="cx">     {
</span><del>-        if (!this._objectId || this._isSymbol() || this._isFakeObject()) {
-            callback([]);
-            return;
-        }
-
-        this._target.RuntimeAgent.getProperties(this._objectId, ownProperties, true, this._getPropertyDescriptorsResolver.bind(this, callback));
-    }
-
-    getOwnPropertyDescriptorsAsObject(callback)
-    {
-        this.getOwnPropertyDescriptors(function(properties) {
</del><ins>+        this.getPropertyDescriptors(function(properties) {
</ins><span class="cx">             var propertiesResult = {};
</span><span class="cx">             var internalPropertiesResult = {};
</span><span class="cx">             for (var propertyDescriptor of properties) {
</span><span class="lines">@@ -671,7 +661,7 @@
</span><span class="cx">                 object[propertyDescriptor.name] = propertyDescriptor;
</span><span class="cx">             }
</span><span class="cx">             callback(propertiesResult, internalPropertiesResult);
</span><del>-        });
</del><ins>+        }, options);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     _getPropertyDescriptorsResolver(callback, error, properties, internalProperties)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsErrorObjectViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.js (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.js       2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.js  2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -92,7 +92,11 @@
</span><span class="cx"> 
</span><span class="cx">     update()
</span><span class="cx">     {
</span><del>-        this._object.getOwnPropertyDescriptorsAsObject((properties) => {
</del><ins>+        const options = {
+            ownProperties: true,
+            generatePreview: true,
+        };
+        this._object.getPropertyDescriptorsAsObject((properties) => {
</ins><span class="cx">             console.assert(properties && properties.stack && properties.stack.value);
</span><span class="cx"> 
</span><span class="cx">             if (!this._hasStackTrace)
</span><span class="lines">@@ -99,7 +103,7 @@
</span><span class="cx">                 this._buildStackTrace(properties.stack.value.value);
</span><span class="cx"> 
</span><span class="cx">             this._hasStackTrace = true;
</span><del>-        });
</del><ins>+        }, options);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     expand()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreePropertyTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js 2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js    2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -321,13 +321,18 @@
</span><span class="cx">         if (this.children.length && !this.shouldRefreshChildren)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><ins>+        const options = {
+            ownProperties: true,
+            generatePreview: true,
+        };
+
</ins><span class="cx">         var resolvedValue = this.resolvedValue();
</span><span class="cx">         if (resolvedValue.isCollectionType() && this._mode === WI.ObjectTreeView.Mode.Properties)
</span><span class="cx">             resolvedValue.getCollectionEntries(0, 100, this._updateChildrenInternal.bind(this, this._updateEntries, this._mode));
</span><span class="cx">         else if (this._mode === WI.ObjectTreeView.Mode.ClassAPI || this._mode === WI.ObjectTreeView.Mode.PureAPI)
</span><del>-            resolvedValue.getOwnPropertyDescriptors(this._updateChildrenInternal.bind(this, this._updateProperties, WI.ObjectTreeView.Mode.ClassAPI));
</del><ins>+            resolvedValue.getPropertyDescriptors(this._updateChildrenInternal.bind(this, this._updateProperties, WI.ObjectTreeView.Mode.ClassAPI), options);
</ins><span class="cx">         else if (this.property.name === "__proto__")
</span><del>-            resolvedValue.getOwnPropertyDescriptors(this._updateChildrenInternal.bind(this, this._updateProperties, WI.ObjectTreeView.Mode.PrototypeAPI));
</del><ins>+            resolvedValue.getPropertyDescriptors(this._updateChildrenInternal.bind(this, this._updateProperties, WI.ObjectTreeView.Mode.PrototypeAPI), options);
</ins><span class="cx">         else
</span><span class="cx">             resolvedValue.getDisplayablePropertyDescriptors(this._updateChildrenInternal.bind(this, this._updateProperties, this._mode));
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js (237570 => 237571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js        2018-10-29 21:48:51 UTC (rev 237570)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js   2018-10-29 23:29:13 UTC (rev 237571)
</span><span class="lines">@@ -246,12 +246,17 @@
</span><span class="cx"> 
</span><span class="cx">     update()
</span><span class="cx">     {
</span><ins>+        const options = {
+            ownProperties: true,
+            generatePreview: true,
+        };
+
</ins><span class="cx">         if (this._object.isCollectionType() && this._mode === WI.ObjectTreeView.Mode.Properties)
</span><span class="cx">             this._object.getCollectionEntries(0, 100, this._updateChildren.bind(this, this._updateEntries));
</span><span class="cx">         else if (this._object.isClass())
</span><span class="cx">             this._object.classPrototype.getDisplayablePropertyDescriptors(this._updateChildren.bind(this, this._updateProperties));
</span><span class="cx">         else if (this._mode === WI.ObjectTreeView.Mode.PureAPI)
</span><del>-            this._object.getOwnPropertyDescriptors(this._updateChildren.bind(this, this._updateProperties));
</del><ins>+            this._object.getPropertyDescriptors(this._updateChildren.bind(this, this._updateProperties), options);
</ins><span class="cx">         else
</span><span class="cx">             this._object.getDisplayablePropertyDescriptors(this._updateChildren.bind(this, this._updateProperties));
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>