[inspector] remove iterators and for...of loops from injected-script-source

src/inspector/injected-script-source.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 317 matching lines @@
     getProperties: function(object, objectGroupName, ownProperties, accessorPropertiesOnly, generatePreview)
     {
         var subtype = this._subtype(object);
         if (subtype === "internal#scope") {
             // Internally, scope contains object with scope variables and additional information like type,
             // we use additional information for preview and would like to report variables as scope
             // properties.
             object = object.object;
         }
 
-        var descriptors = [];
-        var iter = this._propertyDescriptors(object, ownProperties, accessorPropertiesOnly, undefined);
         // Go over properties, wrap object values.
-        for (var descriptor of iter) {
-            if (subtype === "internal#scopeList" && descriptor.name === "length")
-                continue;
+        var descriptors = this._propertyDescriptors(object, ownProperties, accessorPropertiesOnly, undefined, false);
+        for (var i = 0; i < descriptors.length; ++i) {
+            var descriptor = descriptors[i];
             if ("get" in descriptor)
                 descriptor.get = this._wrapObject(descriptor.get, objectGroupName);
             if ("set" in descriptor)
                 descriptor.set = this._wrapObject(descriptor.set, objectGroupName);
             if ("value" in descriptor)
                 descriptor.value = this._wrapObject(descriptor.value, objectGroupName, false, generatePreview);
             if (!("configurable" in descriptor))
                 descriptor.configurable = false;
             if (!("enumerable" in descriptor))
                 descriptor.enumerable = false;
             if ("symbol" in descriptor)
                 descriptor.symbol = this._wrapObject(descriptor.symbol, objectGroupName);
-            push(descriptors, descriptor);
         }
         return descriptors;
     },
 
     /**
      * @param {!Object} object
      * @return {?Object}
      */
     _objectPrototype: function(object)
     {
         if (InjectedScriptHost.subtype(object) === "proxy")
             return null;
         try {
             return Object.getPrototypeOf(object);
         } catch (e) {
             return null;
         }
     },
 
     /**
      * @param {!Object} object
      * @param {boolean=} ownProperties
      * @param {boolean=} accessorPropertiesOnly
-     * @param {?Array.<string>=} propertyNamesOnly
+     * @param {?Array<string>=} propertyNamesOnly
+     * @param {boolean=} forPreview
+     * @param {!function(!Array<!Object>, !Object)=} addPropertyIfNeeded
+     * @return {!Array<!Object>}
      */
-    _propertyDescriptors: function*(object, ownProperties, accessorPropertiesOnly, propertyNamesOnly)
+    _propertyDescriptors: function(object, ownProperties, accessorPropertiesOnly, propertyNamesOnly, forPreview, addPropertyIfNeeded)
     {
+        var descriptors = [];
+        descriptors.__proto__ = null;
+        addPropertyIfNeeded = addPropertyIfNeeded || function(descriptors, descriptor) { push(descriptors, descriptor); return true; };
         var propertyProcessed = { __proto__: null };
+        var subtype = InjectedScriptHost.subtype(object);
 
         /**
-         * @param {?Object} o
-         * @param {!Iterable<string|symbol|number>|!Array<string|number|symbol>} properties
+         * @param {!Object} o
+         * @param {!Array<string|number|symbol>=} properties
+         * @param {number=} objectLength
+         * @return {boolean}
          */
-        function* process(o, properties)
+        function process(o, properties, objectLength)
         {
-            for (var property of properties) {
+            // When properties is not provided, iterate over the object's indices.
+            var length = properties ? properties.length : objectLength;
+            for (var i = 0; i < length; ++i) {
+                var property = properties ? properties[i] : ("" + i);
+                if (propertyProcessed[property])
+                    continue;
+                propertyProcessed[property] = true;
                 var name;
                 if (isSymbol(property))
                     name = /** @type {string} */ (injectedScript._describe(property));
                 else
                     name = typeof property === "number" ? ("" + property) : /** @type {string} */(property);
 
-                if (propertyProcessed[property])
+                if (subtype === "internal#scopeList" && name === "length")
                     continue;
 
+                var descriptor;
                 try {
-                    propertyProcessed[property] = true;
-                    var descriptor = nullifyObjectProto(Object.getOwnPropertyDescriptor(o, property));
-                    if (descriptor) {
-                        if (accessorPropertiesOnly && !("get" in descriptor || "set" in descriptor))
-                            continue;
-                        if ("get" in descriptor && "set" in descriptor && name != "__proto__" && InjectedScriptHost.formatAccessorsAsProperties(object, descriptor.get) && !doesAttributeHaveObservableSideEffectOnGet(object, name)) {
-                            descriptor.value = object[property];
-                            descriptor.isOwn = true;
-                            delete descriptor.get;
-                            delete descriptor.set;
-                        }
-                    } else {
-                        // Not all bindings provide proper descriptors. Fall back to the writable, configurable property.
-                        if (accessorPropertiesOnly)
-                            continue;
-                        try {
-                            descriptor = { name: name, value: o[property], writable: false, configurable: false, enumerable: false, __proto__: null };
-                            if (o === object)
-                                descriptor.isOwn = true;
-                            yield descriptor;
-                        } catch (e) {
-                            // Silent catch.
-                        }
+                    descriptor = Object.getOwnPropertyDescriptor(o, property);
+                    var isAccessorProperty = descriptor && ("get" in descriptor || "set" in descriptor);
+                    if (accessorPropertiesOnly && !isAccessorProperty)
+                        continue;
+                    if (descriptor && "get" in descriptor && "set" in descriptor && name !== "__proto__" &&
+                            InjectedScriptHost.formatAccessorsAsProperties(object, descriptor.get) &&
+                            !doesAttributeHaveObservableSideEffectOnGet(object, name)) {
+                        descriptor.value = object[property];
+                        descriptor.isOwn = true;
+                        delete descriptor.get;
+                        delete descriptor.set;
+                    }
+                } catch (e) {
+                    if (accessorPropertiesOnly || forPreview)

[kozy, 2017/02/28 17:14:43]

Can we filter it inside of addPropertyIfNeeded by wasThrown flag for preview?

[luoe, 2017/02/28 21:46:39]

Done.

+                        continue;
+                    descriptor = { value: e, wasThrown: true };
+                }
+
+                // Not all bindings provide proper descriptors. Fall back to the non-configurable, non-enumerable,
+                // non-writable property.
+                if (!descriptor) {
+                    try {
+                        descriptor = { value: o[property], writable: false };
+                    } catch (e) {
+                        // Silent catch.
                         continue;
                     }
-                } catch (e) {
-                    if (accessorPropertiesOnly)
-                        continue;
-                    var descriptor = { __proto__: null };
-                    descriptor.value = e;
-                    descriptor.wasThrown = true;
                 }
 
                 descriptor.name = name;
                 if (o === object)
                     descriptor.isOwn = true;
                 if (isSymbol(property))
                     descriptor.symbol = property;
-                yield descriptor;
+                if (forPreview) {
+                    // Ignore __proto__ property.

[kozy, 2017/02/28 17:14:43]

Can we move this into addPropertyIfNeeded for preview?

[luoe, 2017/02/28 21:46:38]

Done.

+                    if (name === "__proto__")
+                        continue;
+
+                    // Ignore length property of array.
+                    if ((subtype === "array" || subtype === "typedarray") && name === "length")
+                        continue;
+
+                    // Ignore size property of map, set.
+                    if ((subtype === "map" || subtype === "set") && name === "size")
+                        continue;
+
+                    // Never preview prototype properties.
+                    if (!descriptor.isOwn)
+                        continue;
+
+                    // Ignore computed properties unless they have getters.
+                    if (!("value" in descriptor) && !descriptor.get)
+                        continue;
+                }
+                descriptor = nullifyObjectProto(descriptor);
+                if (!addPropertyIfNeeded(descriptors, descriptor))
+                    return false;
             }
+            return true;
         }
 
         if (propertyNamesOnly) {
             for (var i = 0; i < propertyNamesOnly.length; ++i) {
                 var name = propertyNamesOnly[i];
-                for (var o = object; this._isDefined(o); o = this._objectPrototype(o)) {
+                for (var o = object; this._isDefined(o); o = this._objectPrototype(/** @type {!Object} */ (o))) {
+                    o = /** @type {!Object} */ (o);
                     if (InjectedScriptHost.objectHasOwnProperty(o, name)) {
-                        for (var descriptor of process(o, [name]))
-                            yield descriptor;
+                        if (!process(o, [name]))
+                            return descriptors;
                         break;
                     }
-                    if (ownProperties)
+                    if (ownProperties || forPreview)

[kozy, 2017/02/28 17:14:43]

can we pass ownProperties = true for preview and with two other comments finally
get rid of forPreview flag?

[luoe, 2017/02/28 21:46:38]

Done.

                         break;
                 }
             }
-            return;
+            return descriptors;
         }
 
-        /**
-         * @param {number} length
-         */
-        function* arrayIndexNames(length)
-        {
-            for (var i = 0; i < length; ++i)
-                yield "" + i;
-        }
-
-        var skipGetOwnPropertyNames;
-        try {
-            skipGetOwnPropertyNames = InjectedScriptHost.subtype(object) === "typedarray" && object.length > 500000;
-        } catch (e) {
-        }
-
-        for (var o = object; this._isDefined(o); o = this._objectPrototype(o)) {
+        for (var o = object; this._isDefined(o); o = this._objectPrototype(/** @type {!Object} */ (o))) {
+            o = /** @type {!Object} */ (o);
             if (InjectedScriptHost.subtype(o) === "proxy")
                 continue;
-            if (skipGetOwnPropertyNames && o === object) {
-                // Avoid OOM crashes from getting all own property names of a large TypedArray.
-                for (var descriptor of process(o, arrayIndexNames(o.length)))
-                    yield descriptor;
-            } else {
-                // First call Object.keys() to enforce ordering of the property descriptors.
-                for (var descriptor of process(o, Object.keys(/** @type {!Object} */ (o))))
-                    yield descriptor;
-                for (var descriptor of process(o, Object.getOwnPropertyNames(/** @type {!Object} */ (o))))
-                    yield descriptor;
+
+            try {
+                var objectLength = o.length;
+                var skipGetOwnPropertyNames = subtype === "typedarray" && objectLength > 500000;
+                if (skipGetOwnPropertyNames && o === object) {
+                    if (!process(o, undefined, objectLength))
+                        return descriptors;
+                } else {
+                    // First call Object.keys() to enforce ordering of the property descriptors.
+                    if (!process(o, Object.keys(o)))
+                        return descriptors;
+                    if (!process(o, Object.getOwnPropertyNames(o)))
+                        return descriptors;
+                }
+                if (Object.getOwnPropertySymbols) {
+                    if (!process(o, Object.getOwnPropertySymbols(o)))
+                        return descriptors;
+                }
+                if (ownProperties) {
+                    var proto = this._objectPrototype(o);
+                    if (proto && !accessorPropertiesOnly) {
+                        var descriptor = { name: "__proto__", value: proto, writable: true, configurable: true, enumerable: false, isOwn: true, __proto__: null };
+                        if (!addPropertyIfNeeded(descriptors, descriptor))
+                            return descriptors;
+                    }
+                }
+            } catch (e) {
             }
-            if (Object.getOwnPropertySymbols) {
-                for (var descriptor of process(o, Object.getOwnPropertySymbols(/** @type {!Object} */ (o))))
-                    yield descriptor;
-            }
-            if (ownProperties) {
-                var proto = this._objectPrototype(o);
-                if (proto && !accessorPropertiesOnly)
-                    yield { name: "__proto__", value: proto, writable: true, configurable: true, enumerable: false, isOwn: true, __proto__: null };
+
+            if (ownProperties || forPreview)
                 break;
-            }
         }
+        return descriptors;
     },
 
     /**
      * @param {string|undefined} objectGroupName
      * @param {*} jsonMLObject
      * @throws {string} error message
      */
     _substituteObjectTagsInCustomPreview: function(objectGroupName, jsonMLObject)
     {
         var maxCustomPreviewRecursionDepth = 20;
@@ skipping 345 matching lines @@
      * @param {?Array.<string>=} firstLevelKeys
      * @param {?Array.<string>=} secondLevelKeys
      * @param {boolean=} isTable
      * @param {boolean=} skipEntriesPreview
      * @return {!RuntimeAgent.ObjectPreview} preview
      */
     _generatePreview: function(object, firstLevelKeys, secondLevelKeys, isTable, skipEntriesPreview)
     {
         var preview = this._createEmptyPreview();
         var firstLevelKeysCount = firstLevelKeys ? firstLevelKeys.length : 0;
-
+        var overflow = false;
         var propertiesThreshold = {
             properties: isTable ? 1000 : max(5, firstLevelKeysCount),
             indexes: isTable ? 1000 : max(100, firstLevelKeysCount),
             __proto__: null
         };
 
         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;
+            var descriptors = injectedScript._propertyDescriptors(object, undefined, undefined, firstLevelKeys, true, addPropertyIfNeeded);

[kozy, 2017/02/28 17:14:43]

please add /* propertyNamesOnly */ comment for undefined.

[luoe, 2017/02/28 21:46:39]

added comment for accessorPropertiesOnly here
and comment for propertyNamesOnly above in getProperties()

 
             // 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, {
+                var internalPropertyDescriptor = {
                     name: rawInternalProperties[i],
                     value: rawInternalProperties[i + 1],
                     isOwn: true,
                     enumerable: true,
                     __proto__: null
-                });
+                };
+                if (!addPropertyIfNeeded(descriptors, internalPropertyDescriptor))
+                    break;
             }
-            this._appendPropertyDescriptors(preview, internalProperties, propertiesThreshold, secondLevelKeys, isTable);
+            this._appendPropertyPreviewDescriptors(preview, descriptors, secondLevelKeys, isTable);
 
             if (this.subtype === "map" || this.subtype === "set" || this.subtype === "iterator")
                 this._appendEntriesPreview(entries, preview, skipEntriesPreview);
 
         } catch (e) {}
+        preview.overflow = preview.overflow || overflow;
 
         return preview;
+
+        /**
+         * @param {!Array<!Object>} descriptors
+         * @param {!Object} descriptor
+         * @return {boolean}
+         */
+        function addPropertyIfNeeded(descriptors, descriptor) {
+            if (toString(descriptor.name >>> 0) === descriptor.name)
+                propertiesThreshold.indexes--;
+            else
+                propertiesThreshold.properties--;
+
+            var canContinue = propertiesThreshold.indexes >= 0 && propertiesThreshold.properties >= 0;
+            if (!canContinue) {
+                overflow = true;

[kozy, 2017/02/28 17:14:43]

preview.overflow = true

[luoe, 2017/02/28 21:46:39]

Done.

+                return false;
+            }
+            push(descriptors, descriptor);
+            return true;
+        }
     },
 
     /**
      * @param {!RuntimeAgent.ObjectPreview} preview
      * @param {!Array.<*>|!Iterable.<*>} descriptors
-     * @param {!Object} propertiesThreshold
      * @param {?Array.<string>=} secondLevelKeys
      * @param {boolean=} isTable
      */
-    _appendPropertyDescriptors: function(preview, descriptors, propertiesThreshold, secondLevelKeys, isTable)
+    _appendPropertyPreviewDescriptors: function(preview, descriptors, secondLevelKeys, isTable)
     {
-        for (var descriptor of descriptors) {
-            if (propertiesThreshold.indexes < 0 || propertiesThreshold.properties < 0)
-                break;
-            if (!descriptor || descriptor.wasThrown)
-                continue;
-
+        for (var i = 0; i < descriptors.length; ++i) {
+            var descriptor = descriptors[i];
             var name = descriptor.name;
-
-            // Ignore __proto__ property.
-            if (name === "__proto__")
-                continue;
-
-            // Ignore length property of array.
-            if ((this.subtype === "array" || this.subtype === "typedarray") && name === "length")
-                continue;
-
-            // Ignore size property of map, set.
-            if ((this.subtype === "map" || this.subtype === "set") && name === "size")
-                continue;
-
-            // Never preview prototype properties.
-            if (!descriptor.isOwn)
-                continue;
-
-            // Ignore computed properties unless they have getters.
-            if (!("value" in descriptor)) {
-                if (descriptor.get)
-                    this._appendPropertyPreview(preview, { name: name, type: "accessor", __proto__: null }, propertiesThreshold);
-                continue;
-            }
-
             var value = descriptor.value;
             var type = typeof value;
 
             // Special-case HTMLAll.
             if (type === "undefined" && injectedScript._isHTMLAllCollection(value))
                 type = "object";
 
-            // Render own properties.
-            if (value === null) {
-                this._appendPropertyPreview(preview, { name: name, type: "object", subtype: "null", value: "null", __proto__: null }, propertiesThreshold);
+            // Ignore computed properties unless they have getters.
+            if (descriptor.get && !("value" in descriptor)) {
+                push(preview.properties, { name: name, type: "accessor", __proto__: null });
                 continue;
             }
 
+            // Render own properties.
+            if (value === null) {
+                push(preview.properties, { name: name, type: "object", subtype: "null", value: "null", __proto__: null });
+                continue;
+            }
+
             var maxLength = 100;
             if (InjectedScript.primitiveTypes[type]) {
                 if (type === "string" && value.length > maxLength)
                     value = this._abbreviateString(value, maxLength, true);
-                this._appendPropertyPreview(preview, { name: name, type: type, value: toStringDescription(value), __proto__: null }, propertiesThreshold);
+                push(preview.properties, { name: name, type: type, value: toStringDescription(value), __proto__: null });
                 continue;
             }
 
             var property = { name: name, type: type, __proto__: null };
             var subtype = injectedScript._subtype(value);
             if (subtype)
                 property.subtype = subtype;
 
             if (secondLevelKeys === null || secondLevelKeys) {
                 var subPreview = this._generatePreview(value, secondLevelKeys || undefined, undefined, isTable);
                 property.valuePreview = subPreview;
                 if (subPreview.overflow)
                     preview.overflow = true;
             } else {
                 var description = "";
                 if (type !== "function")
                     description = this._abbreviateString(/** @type {string} */ (injectedScript._describe(value)), maxLength, subtype === "regexp");
                 property.value = description;
             }
-            this._appendPropertyPreview(preview, property, propertiesThreshold);
-        }
-    },
-
-    /**
-     * @param {!RuntimeAgent.ObjectPreview} preview
-     * @param {!Object} property
-     * @param {!Object} propertiesThreshold
-     */
-    _appendPropertyPreview: function(preview, property, propertiesThreshold)
-    {
-        if (toString(property.name >>> 0) === property.name)
-            propertiesThreshold.indexes--;
-        else
-            propertiesThreshold.properties--;
-        if (propertiesThreshold.indexes < 0 || propertiesThreshold.properties < 0) {
-            preview.overflow = true;
-        } else {
             push(preview.properties, property);
         }
     },
 
     /**
      * @param {?Array<*>} entries
      * @param {!RuntimeAgent.ObjectPreview} preview
      * @param {boolean=} skipEntriesPreview
      */
     _appendEntriesPreview: function(entries, preview, skipEntriesPreview)
@@ skipping 50 matching lines @@
             return string.substr(0, leftHalf) + "\u2026" + string.substr(string.length - rightHalf, rightHalf);
         }
         return string.substr(0, maxLength) + "\u2026";
     },
 
     __proto__: null
 }
 
 return injectedScript;
 })