[DevTools] Move collectionEntries to internalProperties in protocol

third_party/WebKit/Source/devtools/front_end/sdk/RemoteObject.js

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 66 matching lines @@
     /**
      * @return {number}
      */
     arrayLength: function()
     {
         throw "Not implemented";
     },
 
     /**
      * @param {function(?Array.<!WebInspector.RemoteObjectProperty>, ?Array.<!WebInspector.RemoteObjectProperty>)} callback
+     * @param {boolean=} generatePreview
      */
-    getOwnProperties: function(callback)
+    getOwnProperties: function(callback, generatePreview)
     {
         throw "Not implemented";
     },
 
     /**
      * @return {!Promise<!{properties: ?Array.<!WebInspector.RemoteObjectProperty>, internalProperties: ?Array.<!WebInspector.RemoteObjectProperty>}>}
      */
     getOwnPropertiesPromise: function()
     {
         return new Promise(promiseConstructor.bind(this));
@@ skipping 208 matching lines @@
             this.functionDetails(success);
         }
     },
 
     /**
      * @param {function(?WebInspector.DebuggerModel.GeneratorObjectDetails)} callback
      */
     generatorObjectDetails: function(callback)
     {
         callback(null);
-    },
-
-    /**
-     * @param {function(?Array<!DebuggerAgent.CollectionEntry>)} callback
-     */
-    collectionEntries: function(callback)
-    {
-        callback(null);
     }
 }
 
 /**
  * @param {*} value
  * @return {!WebInspector.RemoteObject}
  */
 WebInspector.RemoteObject.fromLocalObject = function(value)
 {
     return new WebInspector.LocalJSONObject(value);
@@ skipping 176 matching lines @@
      * @return {!RuntimeAgent.ObjectPreview|undefined}
      */
     get preview()
     {
         return this._preview;
     },
 
     /**
      * @override
      * @param {function(?Array.<!WebInspector.RemoteObjectProperty>, ?Array.<!WebInspector.RemoteObjectProperty>)} callback
+     * @param {boolean=} generatePreview

[dgozman, 2016/06/28 01:20:47]

Let's make it non-optional. Do we have a lot of call sites?

[kozy, 2016/06/28 18:41:49]

Removed.

      */
-    getOwnProperties: function(callback)
+    getOwnProperties: function(callback, generatePreview)
     {
-        this.doGetProperties(true, false, false, callback);
+        this.doGetProperties(true, false, generatePreview || false, callback);
     },
 
     /**
      * @override
      * @param {boolean} accessorPropertiesOnly
      * @param {function(?Array.<!WebInspector.RemoteObjectProperty>, ?Array.<!WebInspector.RemoteObjectProperty>)} callback
      */
     getAllProperties: function(accessorPropertiesOnly, callback)
     {
         this.doGetProperties(false, accessorPropertiesOnly, false, callback);
@@ skipping 352 matching lines @@
 
     /**
      * @override
      * @param {function(?WebInspector.DebuggerModel.GeneratorObjectDetails)} callback
      */
     generatorObjectDetails: function(callback)
     {
         this._debuggerModel.generatorObjectDetails(this, callback);
     },
 
-    /**
-     * @override
-     * @param {function(?Array.<!DebuggerAgent.CollectionEntry>)} callback
-     */
-    collectionEntries: function(callback)
-    {
-        if (!this._objectId) {
-            callback(null);
-            return;
-        }
-        this._debuggerModel.getCollectionEntries(this._objectId, callback);
-    },
-
     __proto__: WebInspector.RemoteObject.prototype
 };
 
 
 /**
  * @param {!WebInspector.RemoteObject} object
  * @param {function(?Array.<!WebInspector.RemoteObjectProperty>, ?Array.<!WebInspector.RemoteObjectProperty>)} callback
  */
 WebInspector.RemoteObject.loadFromObjectPerProto = function(object, callback)
 {
@@ skipping 161 matching lines @@
  * @constructor
  * @param {number} number
  * @param {string=} callFrameId
  */
 WebInspector.ScopeRef = function(number, callFrameId)
 {
     this.number = number;
     this.callFrameId = callFrameId;
 }
 
+
+/**
+ * @constructor
+ * @extends {WebInspector.RemoteObjectImpl}
+ * @param {!WebInspector.Target} target
+ * @param {string|undefined} objectId
+ * @param {string} type
+ * @param {string|undefined} subtype
+ * @param {*} value
+ * @param {string=} description
+ * @param {!RuntimeAgent.ObjectPreview=} preview
+ */
+WebInspector.EntryRemoteObject = function(target, objectId, type, subtype, value, description, preview)
+{
+    WebInspector.RemoteObjectImpl.call(this, target, objectId, type, subtype, value, description, preview);
+}
+
+WebInspector.EntryRemoteObject.prototype = {
+    /**
+     * @override
+     * @return {string|undefined}
+     */
+    get description()
+    {
+        if (!this._cachedDescription) {
+            var properties = this.preview.properties.reduce((map, object) => map.set(object.name, this._formatValue(object)), new Map());

[dgozman, 2016/06/28 01:20:47]

Turn it into for-loop please.

[kozy, 2016/06/28 18:41:49]

Removed.

+            if (properties.has("key"))
+                this._cachedDescription = "{" + properties.get("key") + " => " + properties.get("value") + "}";
+            else
+                this._cachedDescription = properties.get("value");
+        }
+        return this._cachedDescription;
+    },
+
+    /**
+     * @param {!RuntimeAgent.PropertyPreview} propertyPreview
+     */
+    _formatValue: function(propertyPreview)
+    {
+        var description = propertyPreview.value || "";
+        if (propertyPreview.type === "string")
+            return "\"" + description.replace(/\n/g, "\u21B5") + "\"";
+        return description;
+    },
+
+    __proto__: WebInspector.RemoteObjectImpl.prototype
+};
+
+
 /**
  * @constructor
  * @param {string} name
  * @param {?WebInspector.RemoteObject} value
  * @param {boolean=} enumerable
  * @param {boolean=} writable
  * @param {boolean=} isOwn
  * @param {boolean=} wasThrown
  * @param {boolean=} synthetic
  * @param {?WebInspector.RemoteObject=} symbol
@@ skipping 167 matching lines @@
     get hasChildren()
     {
         if ((typeof this._value !== "object") || (this._value === null))
             return false;
         return !!Object.keys(/** @type {!Object} */ (this._value)).length;
     },
 
     /**
      * @override
      * @param {function(?Array.<!WebInspector.RemoteObjectProperty>, ?Array.<!WebInspector.RemoteObjectProperty>)} callback
+     * @param {boolean=} generatePreview
      */
-    getOwnProperties: function(callback)
+    getOwnProperties: function(callback, generatePreview)
     {
         callback(this._children(), null);
     },
 
     /**
      * @override
      * @param {boolean} accessorPropertiesOnly
      * @param {function(?Array.<!WebInspector.RemoteObjectProperty>, ?Array.<!WebInspector.RemoteObjectProperty>)} callback
      */
     getAllProperties: function(accessorPropertiesOnly, callback)
@@ skipping 291 matching lines @@
     },
 
     /**
      * @return {!WebInspector.RemoteObject}
      */
     object: function()
     {
         return this._object;
     }
 }
-
-/**
- * @constructor
- * @extends {WebInspector.LocalJSONObject}
- * @param {*} value
- */
-WebInspector.MapEntryLocalJSONObject = function(value)
-{
-    WebInspector.LocalJSONObject.call(this, value);
-}
-
-WebInspector.MapEntryLocalJSONObject.prototype = {
-    /**
-     * @override
-     * @return {string}
-     */
-    get description()
-    {
-        if (!this._cachedDescription) {
-            var children = this._children();
-            this._cachedDescription = "{" + this._formatValue(children[0].value) + " => " + this._formatValue(children[1].value) + "}";
-        }
-        return this._cachedDescription;
-    },
-
-    __proto__: WebInspector.LocalJSONObject.prototype
-}