<!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>[248589] trunk/Source/WebInspectorUI</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/248589">248589</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2019-08-12 20:54:38 -0700 (Mon, 12 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: remove WI.DeprecatedRemoteObjectProperty
https://bugs.webkit.org/show_bug.cgi?id=200549

Reviewed by Joseph Pecoraro.

* UserInterface/Protocol/RemoteObject.js:
(WI.RemoteObject.prototype.deprecatedGetOwnProperties): Deleted.
(WI.RemoteObject.prototype.deprecatedGetAllProperties): Deleted.
(WI.RemoteObject.prototype.deprecatedGetDisplayableProperties): Deleted.
(WI.RemoteObject.prototype._deprecatedGetProperties): Deleted.
(WI.RemoteObject.prototype._deprecatedGetPropertiesResolver): Deleted.
(WI.DeprecatedRemoteObjectProperty): Deleted.
(WI.DeprecatedRemoteObjectProperty.prototype.fromPrimitiveValue): Deleted.

* UserInterface/Models/CallFrame.js:
(WI.CallFrame.prototype.collectScopeChainVariableNames):

* UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
(WI.DOMNodeDetailsSidebarPanel.prototype._refreshProperties):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs">trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (248588 => 248589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2019-08-13 03:52:38 UTC (rev 248588)
+++ trunk/Source/WebInspectorUI/ChangeLog       2019-08-13 03:54:38 UTC (rev 248589)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2019-08-12  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><ins>+        Web Inspector: remove WI.DeprecatedRemoteObjectProperty
+        https://bugs.webkit.org/show_bug.cgi?id=200549
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Protocol/RemoteObject.js:
+        (WI.RemoteObject.prototype.deprecatedGetOwnProperties): Deleted.
+        (WI.RemoteObject.prototype.deprecatedGetAllProperties): Deleted.
+        (WI.RemoteObject.prototype.deprecatedGetDisplayableProperties): Deleted.
+        (WI.RemoteObject.prototype._deprecatedGetProperties): Deleted.
+        (WI.RemoteObject.prototype._deprecatedGetPropertiesResolver): Deleted.
+        (WI.DeprecatedRemoteObjectProperty): Deleted.
+        (WI.DeprecatedRemoteObjectProperty.prototype.fromPrimitiveValue): Deleted.
+
+        * UserInterface/Models/CallFrame.js:
+        (WI.CallFrame.prototype.collectScopeChainVariableNames):
+
+        * UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
+        (WI.DOMNodeDetailsSidebarPanel.prototype._refreshProperties):
+
+2019-08-12  Devin Rousso  <drousso@apple.com>
+
</ins><span class="cx">         Web Inspector: REGRESSION(r248201): DOMDebugger: unable to add event breakpoint when All Events breakpoint is enabled
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=200561
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js (248588 => 248589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js    2019-08-13 03:52:38 UTC (rev 248588)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js       2019-08-13 03:54:38 UTC (rev 248589)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         for (var i = 0; i < this._scopeChain.length; ++i)
</span><del>-            this._scopeChain[i].objects[0].deprecatedGetAllProperties(propertiesCollected);
</del><ins>+            this._scopeChain[i].objects[0].getPropertyDescriptors(propertiesCollected);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     mergedScopeChain()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js (248588 => 248589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js       2019-08-13 03:52:38 UTC (rev 248588)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js  2019-08-13 03:54:38 UTC (rev 248589)
</span><span class="lines">@@ -309,52 +309,6 @@
</span><span class="cx">         this._target.RuntimeAgent.getDisplayableProperties(this._objectId, true, this._getPropertyDescriptorsResolver.bind(this, callback));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // FIXME: Phase out these deprecated functions. They return DeprecatedRemoteObjectProperty instead of PropertyDescriptors.
-    deprecatedGetOwnProperties(callback)
-    {
-        this._deprecatedGetProperties(true, callback);
-    }
-
-    deprecatedGetAllProperties(callback)
-    {
-        this._deprecatedGetProperties(false, callback);
-    }
-
-    deprecatedGetDisplayableProperties(callback)
-    {
-        if (!this._objectId || this._isSymbol() || this._isFakeObject()) {
-            callback([]);
-            return;
-        }
-
-        // COMPATIBILITY (iOS 8): RuntimeAgent.getProperties did not support ownerAndGetterProperties.
-        // Here we do our best to reimplement it by getting all properties and reducing them down.
-        if (!this._target.RuntimeAgent.getDisplayableProperties) {
-            this._target.RuntimeAgent.getProperties(this._objectId, function(error, allProperties) {
-                var ownOrGetterPropertiesList = [];
-                if (allProperties) {
-                    for (var property of allProperties) {
-                        if (property.isOwn || property.get || property.name === "__proto__") {
-                            // Own property or getter property in prototype chain.
-                            ownOrGetterPropertiesList.push(property);
-                        } else if (property.value && property.name !== property.name.toUpperCase()) {
-                            var type = property.value.type;
-                            if (type && type !== "function" && property.name !== "constructor") {
-                                // Possible native binding getter property converted to a value. Also, no CONSTANT name style and not "constructor".
-                                ownOrGetterPropertiesList.push(property);
-                            }
-                        }
-                    }
-                }
-
-                this._deprecatedGetPropertiesResolver(callback, error, ownOrGetterPropertiesList);
-            }.bind(this));
-            return;
-        }
-
-        this._target.RuntimeAgent.getDisplayableProperties(this._objectId, this._deprecatedGetPropertiesResolver.bind(this, callback));
-    }
-
</del><span class="cx">     setPropertyValue(name, value, callback)
</span><span class="cx">     {
</span><span class="cx">         if (!this._objectId || this._isSymbol() || this._isFakeObject()) {
</span><span class="lines">@@ -670,49 +624,6 @@
</span><span class="cx"> 
</span><span class="cx">         callback(descriptors);
</span><span class="cx">     }
</span><del>-
-    // FIXME: Phase out these deprecated functions. They return DeprecatedRemoteObjectProperty instead of PropertyDescriptors.
-    _deprecatedGetProperties(ownProperties, callback)
-    {
-        if (!this._objectId || this._isSymbol() || this._isFakeObject()) {
-            callback([]);
-            return;
-        }
-
-        this._target.RuntimeAgent.getProperties(this._objectId, ownProperties, this._deprecatedGetPropertiesResolver.bind(this, callback));
-    }
-
-    _deprecatedGetPropertiesResolver(callback, error, properties, internalProperties)
-    {
-        if (error) {
-            callback(null);
-            return;
-        }
-
-        if (internalProperties) {
-            properties = properties.concat(internalProperties.map(function(descriptor) {
-                descriptor.writable = false;
-                descriptor.configurable = false;
-                descriptor.enumerable = false;
-                descriptor.isOwn = true;
-                return descriptor;
-            }));
-        }
-
-        var result = [];
-        for (var i = 0; properties && i < properties.length; ++i) {
-            var property = properties[i];
-            if (property.get || property.set) {
-                if (property.get)
-                    result.push(new WI.DeprecatedRemoteObjectProperty("get " + property.name, WI.RemoteObject.fromPayload(property.get, this._target), property));
-                if (property.set)
-                    result.push(new WI.DeprecatedRemoteObjectProperty("set " + property.name, WI.RemoteObject.fromPayload(property.set, this._target), property));
-            } else
-                result.push(new WI.DeprecatedRemoteObjectProperty(property.name, WI.RemoteObject.fromPayload(property.value, this._target), property));
-        }
-
-        callback(result);
-    }
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> WI.RemoteObject.FakeRemoteObjectId = "fake-remote-object";
</span><span class="lines">@@ -721,24 +632,3 @@
</span><span class="cx">     NoSourceFound: "remote-object-source-code-location-promise-no-source-found",
</span><span class="cx">     MissingObjectId: "remote-object-source-code-location-promise-missing-object-id"
</span><span class="cx"> };
</span><del>-
-// FIXME: Phase out this deprecated class.
-WI.DeprecatedRemoteObjectProperty = class DeprecatedRemoteObjectProperty
-{
-    constructor(name, value, descriptor)
-    {
-        this.name = name;
-        this.value = value;
-        this.enumerable = descriptor ? !!descriptor.enumerable : true;
-        this.writable = descriptor ? !!descriptor.writable : true;
-        if (descriptor && descriptor.wasThrown)
-            this.wasThrown = true;
-    }
-
-    // Static
-
-    fromPrimitiveValue(name, value)
-    {
-        return new WI.DeprecatedRemoteObjectProperty(name, WI.RemoteObject.fromPrimitiveValue(value));
-    }
-};
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js (248588 => 248589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js    2019-08-13 03:52:38 UTC (rev 248588)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js       2019-08-13 03:54:38 UTC (rev 248589)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx">             if (this.domNode !== domNode)
</span><span class="cx">                 return;
</span><span class="cx"> 
</span><del>-            object.deprecatedGetOwnProperties(fillSection.bind(this));
</del><ins>+            object.getPropertyDescriptors(fillSection.bind(this), {ownProperties: true});
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function fillSection(prototypes)
</span></span></pre>
</div>
</div>

</body>
</html>