Merge 135720 - Web Inspector: object preview does not render node id, className; logs too many func…

Source/WebCore/inspector/InjectedScriptSource.js

 /*
  * Copyright (C) 2007 Apple 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 694 matching lines @@
         if (subtype === "regexp")
             return this._toString(obj);
 
         if (subtype === "date")
             return this._toString(obj);
 
         if (subtype === "node") {
             var description = obj.nodeName.toLowerCase();
             switch (obj.nodeType) {
             case 1 /* Node.ELEMENT_NODE */:
-                description =  "<" + description + ">";
+                description += obj.id ? "#" + obj.id : "";
+                var className = obj.className;
+                description += className ? "." + className : "";
                 break;
             case 10 /*Node.DOCUMENT_TYPE_NODE */:
                 description = "<!DOCTYPE " + description + ">";
                 break;
             }
             return description;
         }
 
         var className = InjectedScriptHost.internalConstructorName(obj);
         if (subtype === "array") {
@@ skipping 76 matching lines @@
      * @param {Object} object
      */
     _generatePreview: function(object)
     {
         this.preview = {};
         this.preview.lossless = true;
         this.preview.overflow = false;
         this.preview.properties = [];
 
         var isArray = this.subtype === "array";
-        var elementsToDump = isArray ? 100 : 5;
+        var propertiesThreshold = {
+            properties: 5,
+            indexes: 100
+        };
 
         for (var o = object; injectedScript._isDefined(o); o = o.__proto__)
-            this._generateProtoPreview(o, elementsToDump);
+            this._generateProtoPreview(o, propertiesThreshold);
     },
 
     /**
      * @param {Object} object
-     * @param {number} elementsToDump
+     * @param {Object} propertiesThreshold
      */
-    _generateProtoPreview: function(object, elementsToDump)
+    _generateProtoPreview: function(object, propertiesThreshold)
     {
         var propertyNames = Object.keys(/** @type {!Object} */(object));
         try {
             for (var i = 0; i < propertyNames.length; ++i) {
-                if (this.preview.properties.length >= elementsToDump) {
+                if (!propertiesThreshold.properties || !propertiesThreshold.indexes) {
                     this.preview.overflow = true;
                     this.preview.lossless = false;
                     break;
                 }
                 var name = propertyNames[i];
                 if (this.subtype === "array" && name === "length")
                     continue;
 
                 var descriptor = Object.getOwnPropertyDescriptor(/** @type {!Object} */(object), name);
                 if (!("value" in descriptor) || !descriptor.enumerable) {
                     this.preview.lossless = false;
                     continue;
                 }
 
                 var value = descriptor.value;
                 if (value === null) {
-                    this.preview.properties.push({ name: name, type: "object", value: "null" });
+                    this._appendPropertyPreview({ name: name, type: "object", value: "null" }, propertiesThreshold);
                     continue;
                 }
     
                 const maxLength = 100;
                 var type = typeof value;
 
                 if (InjectedScript.primitiveTypes[type]) {
                     if (type === "string") {
                         if (value.length > maxLength) {
                             value = this._abbreviateString(value, maxLength, true);
                             this.preview.lossless = false;
                         }
                         value = "\"" + value.replace(/\n/g, "\u21B5") + "\"";
                     }
-                    this.preview.properties.push({ name: name, type: type, value: value + "" });
+                    this._appendPropertyPreview({ name: name, type: type, value: value + "" }, propertiesThreshold);
                     continue;
                 }
     
                 this.preview.lossless = false;
 
                 var subtype = injectedScript._subtype(value);
                 var description = "";
                 if (type !== "function")
                     description = this._abbreviateString(/** @type {string} */ (injectedScript._describe(value)), maxLength, subtype === "regexp");
 
                 var property = { name: name, type: type, value: description };
                 if (subtype)
                     property.subtype = subtype;
-                this.preview.properties.push(property);
+                this._appendPropertyPreview(property, propertiesThreshold);
             }
         } catch (e) {
         }
     },
 
     /**
+     * @param {Object} property
+     * @param {Object} propertiesThreshold
+     */
+    _appendPropertyPreview: function(property, propertiesThreshold)
+    {
+        if (isNaN(property.name))
+            propertiesThreshold.properties--;
+        else
+            propertiesThreshold.indexes--;
+        this.preview.properties.push(property);
+    },
+
+    /**
      * @param {string} string
      * @param {number} maxLength
      * @param {boolean=} middle
      * @returns
      */
     _abbreviateString: function(string, maxLength, middle)
     {
         if (string.length <= maxLength)
             return string;
         if (middle) {
@@ skipping 317 matching lines @@
      */
     _logEvent: function(event)
     {
         console.log(event.type, event);
     }
 }
 
 injectedScript._commandLineAPIImpl = new CommandLineAPIImpl();
 return injectedScript;
 })