[inspector] description for weak collections should not contain size

These JS objects don't have size property.

BUG=none
R=dgozman@chromium.org,luoe@chromium.org

Review-Url: https://codereview.chromium.org/2770583002
Cr-Commit-Position: refs/heads/master@{#44048}

src/inspector/injected-script-source.js

@@ -917,7 +917,7 @@ InjectedScript.RemoteObject.prototype = {
             }
             this._appendPropertyPreviewDescriptors(preview, descriptors, secondLevelKeys, isTable);
 
-            if (subtype === "map" || subtype === "set" || subtype === "iterator")
+            if (subtype === "map" || subtype === "set" || subtype === "weakmap" || subtype === "weakset" || subtype === "iterator")
                 this._appendEntriesPreview(entries, preview, skipEntriesPreview);
 
         } catch (e) {}

src/inspector/js_protocol.json

@@ -52,7 +52,7 @@
                 "description": "Mirror object referencing original JavaScript object.",
                 "properties": [
                     { "name": "type", "type": "string", "enum": ["object", "function", "undefined", "string", "number", "boolean", "symbol"], "description": "Object type." },
-                    { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "map", "set", "iterator", "generator", "error", "proxy", "promise", "typedarray"], "description": "Object subtype hint. Specified for <code>object</code> type values only." },
+                    { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "map", "set", "weakmap", "weakset", "iterator", "generator", "error", "proxy", "promise", "typedarray"], "description": "Object subtype hint. Specified for <code>object</code> type values only." },
                     { "name": "className", "type": "string", "optional": true, "description": "Object class (constructor) name. Specified for <code>object</code> type values only." },
                     { "name": "value", "type": "any", "optional": true, "description": "Remote object value in case of primitive values or JSON values (if it was requested)." },
                     { "name": "unserializableValue", "$ref": "UnserializableValue", "optional": true, "description": "Primitive value which can not be JSON-stringified does not have <code>value</code>, but gets this property." },
@@ -81,7 +81,7 @@
                 "description": "Object containing abbreviated remote object value.",
                 "properties": [
                     { "name": "type", "type": "string", "enum": ["object", "function", "undefined", "string", "number", "boolean", "symbol"], "description": "Object type." },
-                    { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "map", "set", "iterator", "generator", "error"], "description": "Object subtype hint. Specified for <code>object</code> type values only." },
+                    { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "map", "set", "weakmap", "weakset", "iterator", "generator", "error"], "description": "Object subtype hint. Specified for <code>object</code> type values only." },
                     { "name": "description", "type": "string", "optional": true, "description": "String representation of the object." },
                     { "name": "overflow", "type": "boolean", "description": "True iff some of the properties or entries of the original object did not fit." },
                     { "name": "properties", "type": "array", "items": { "$ref": "PropertyPreview" }, "description": "List of the properties." },
@@ -97,7 +97,7 @@
                     { "name": "type", "type": "string", "enum": ["object", "function", "undefined", "string", "number", "boolean", "symbol", "accessor"], "description": "Object type. Accessor means that the property itself is an accessor property." },
                     { "name": "value", "type": "string", "optional": true, "description": "User-friendly property value string." },
                     { "name": "valuePreview", "$ref": "ObjectPreview", "optional": true, "description": "Nested value preview." },
-                    { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "map", "set", "iterator", "generator", "error"], "description": "Object subtype hint. Specified for <code>object</code> type values only." }
+                    { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "map", "set", "weakmap", "weakset", "iterator", "generator", "error"], "description": "Object subtype hint. Specified for <code>object</code> type values only." }
                 ]
             },
             {

src/inspector/v8-injected-script-host.cc

@@ -127,14 +127,22 @@ void V8InjectedScriptHost::subtypeCallback(
     info.GetReturnValue().Set(toV8StringInternalized(isolate, "regexp"));
     return;
   }
-  if (value->IsMap() || value->IsWeakMap()) {
+  if (value->IsMap()) {
     info.GetReturnValue().Set(toV8StringInternalized(isolate, "map"));
     return;
   }
-  if (value->IsSet() || value->IsWeakSet()) {
+  if (value->IsWeakMap()) {
+    info.GetReturnValue().Set(toV8StringInternalized(isolate, "weakmap"));
+    return;
+  }
+  if (value->IsSet()) {
     info.GetReturnValue().Set(toV8StringInternalized(isolate, "set"));
     return;
   }
+  if (value->IsWeakSet()) {
+    info.GetReturnValue().Set(toV8StringInternalized(isolate, "weakset"));
+    return;
+  }
   if (value->IsMapIterator() || value->IsSetIterator()) {
     info.GetReturnValue().Set(toV8StringInternalized(isolate, "iterator"));
     return;

test/inspector/runtime/length-or-size-description-expected.txt

@@ -7,6 +7,8 @@ Array(0)
 Array(2)
 Uint8Array(0)
 Uint8Array(2)
+WeakMap
+WeakSet
 Set(0)
 Set(2)
 Map(0)
@@ -15,3 +17,5 @@ Array(0)
 Array(2)
 Uint8Array(0)
 Uint8Array(2)
+WeakMap
+WeakSet

test/inspector/runtime/length-or-size-description.js

@@ -12,7 +12,10 @@ Promise.all([
   testExpression("new Array()"),
   testExpression("new Array(2)"),
   testExpression("new Uint8Array()"),
-  testExpression("new Uint8Array(2)")
+  testExpression("new Uint8Array(2)"),
+  // WeakMap and WeakSet should not have size in description.
+  testExpression("new WeakMap([[{}, 42]])"),
+  testExpression("new WeakSet([{}])")
 ]).then(() => InspectorTest.completeTest());
 
 function testExpression(expression) {