[DevTools] Move collectionEntries to internalProperties in protocol

third_party/WebKit/Source/platform/v8_inspector/InjectedScriptSource.js

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2013 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 617 matching lines @@
                 var stackMessageEnd = firstCallFrame ? firstCallFrame.index : -1;
                 if (stackMessageEnd !== -1) {
                     var stackTrace = stack.substr(stackMessageEnd);
                     return className + message + "\n" + stackTrace;
                 }
                 return className + message;
             } catch(e) {
             }
         }
 
+        if (subtype === "internal#entry") {
+            if ("key" in obj)
+                return "{" + this._describeEverything(obj.key) + " => " + this._describeEverything(obj.value) + "}";
+            return this._describeEverything(obj.value);
+        }
+
         return className;
     },
 
     /**
+     * @param {*} obj
+     * @return {string}
+     */
+    _describeEverything: function(value)

[dgozman, 2016/06/28 18:58:08]

_describeIncludingPrimitives

[kozy, 2016/06/28 20:55:46]

Done.

+    {
+        if (typeof value === "string")
+            return "\"" + value.replace(/\n/g, "\u21B5") + "\"";
+        if (value === null)
+            return "" + value;
+        return this.isPrimitiveValue(value) ? toStringDescription(value) : this._describe(value);
+    },
+
+    /**
      * @param {boolean} enabled
      */
     setCustomObjectFormatterEnabled: function(enabled)
     {
         this._customObjectFormatterEnabled = enabled;
     }
 }
 
 /**
  * @type {!InjectedScript}
@@ skipping 168 matching lines @@
         try {
             var descriptors = injectedScript._propertyDescriptors(object, undefined, undefined, firstLevelKeys);
 
             this._appendPropertyDescriptors(preview, descriptors, propertiesThreshold, secondLevelKeys, isTable);
             if (propertiesThreshold.indexes < 0 || propertiesThreshold.properties < 0)
                 return preview;
 
             // Add internal properties to preview.
             var rawInternalProperties = InjectedScriptHost.getInternalProperties(object) || [];
             var internalProperties = [];
+            var entries = null;
             for (var i = 0; i < rawInternalProperties.length; i += 2) {
+                if (rawInternalProperties[i] === "[[Entries]]") {
+                    entries = /** @type {!Array<*>} */(rawInternalProperties[i + 1]);
+                    continue;
+                }
                 push(internalProperties, {
                     name: rawInternalProperties[i],
                     value: rawInternalProperties[i + 1],
                     isOwn: true,
                     enumerable: true,
                     __proto__: null
                 });
             }
             this._appendPropertyDescriptors(preview, internalProperties, propertiesThreshold, secondLevelKeys, isTable);
 
             if (this.subtype === "map" || this.subtype === "set" || this.subtype === "iterator")
-                this._appendEntriesPreview(object, preview, skipEntriesPreview);
+                this._appendEntriesPreview(entries, preview, skipEntriesPreview);
 
         } catch (e) {}
 
         return preview;
     },
 
     /**
      * @param {!RuntimeAgent.ObjectPreview} preview
      * @param {!Array.<*>|!Iterable.<*>} descriptors
      * @param {!Object} propertiesThreshold
@@ skipping 87 matching lines @@
         else
             propertiesThreshold.properties--;
         if (propertiesThreshold.indexes < 0 || propertiesThreshold.properties < 0) {
             preview.overflow = true;
         } else {
             push(preview.properties, property);
         }
     },
 
     /**
-     * @param {!Object} object
+     * @param {?Array<*>} entries
      * @param {!RuntimeAgent.ObjectPreview} preview
      * @param {boolean=} skipEntriesPreview
      */
-    _appendEntriesPreview: function(object, preview, skipEntriesPreview)
+    _appendEntriesPreview: function(entries, preview, skipEntriesPreview)
     {
-        var entries = InjectedScriptHost.collectionEntries(object);
         if (!entries)
             return;
         if (skipEntriesPreview) {
             if (entries.length)
                 preview.overflow = true;
             return;
         }
         preview.entries = [];
         var entriesThreshold = 5;
         for (var i = 0; i < entries.length; ++i) {
@@ skipping 39 matching lines @@
             return string.substr(0, leftHalf) + "\u2026" + string.substr(string.length - rightHalf, rightHalf);
         }
         return string.substr(0, maxLength) + "\u2026";
     },
 
     __proto__: null
 }
 
 return injectedScript;
 })