[DevTools] Remove Object.values and Object.isEmpty from utilities.js

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

 /*
  * Copyright (C) 2011 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 71 matching lines @@
 }
 
 
 /**
  * @return {!Array.<!WebInspector.ResourceTreeFrame>}
  */
 WebInspector.ResourceTreeModel.frames = function()
 {
     var result = [];
     for (var target of WebInspector.targetManager.targets())
-        result = result.concat(Object.values(target.resourceTreeModel._frames));
+        result = result.concat(Array.from(target.resourceTreeModel._frames.values()));

[lushnikov, 2016/07/20 03:02:50]

.valuesArray()

[kozy, 2016/07/20 17:55:18]

Done.

     return result;
 }
 
 /**
  * @param {string} url
  * @return {?WebInspector.Resource}
  */
 WebInspector.ResourceTreeModel.resourceForURL = function(url)
 {
     for (var target of WebInspector.targetManager.targets()) {
         var mainFrame = target.resourceTreeModel.mainFrame;
         var result = mainFrame ? mainFrame.resourceForURL(url) : null;
         if (result)
             return result;
     }
     return null;
 }
 
 WebInspector.ResourceTreeModel.prototype = {
     _fetchResourceTree: function()
     {
-        /** @type {!Object.<string, !WebInspector.ResourceTreeFrame>} */
-        this._frames = {};
+        /** @type {!Map<string, !WebInspector.ResourceTreeFrame>} */
+        this._frames = new Map();
         this._cachedResourcesProcessed = false;
         this._agent.getResourceTree(this._processCachedResources.bind(this));
     },
 
     _processCachedResources: function(error, mainFramePayload)
     {
         if (error) {
             this._cachedResourcesProcessed = true;
             this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded);
             return;
@@ skipping 43 matching lines @@
         InspectorFrontendHost.inspectedURLChanged(this._inspectedPageURL);
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.InspectedURLChanged, this._inspectedPageURL);
     },
 
     /**
      * @param {!WebInspector.ResourceTreeFrame} frame
      * @param {boolean=} aboutToNavigate
      */
     _addFrame: function(frame, aboutToNavigate)
     {
-        this._frames[frame.id] = frame;
+        this._frames.set(frame.id, frame);
         if (frame.isMainFrame())
             this.mainFrame = frame;
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameAdded, frame);
         if (!aboutToNavigate)
             this._addSecurityOrigin(frame.securityOrigin);
     },
 
     /**
      * @param {string} securityOrigin
      */
@@ skipping 52 matching lines @@
     /**
      * @param {!PageAgent.FrameId} frameId
      * @param {?PageAgent.FrameId} parentFrameId
      * @return {?WebInspector.ResourceTreeFrame}
      */
     _frameAttached: function(frameId, parentFrameId)
     {
         // Do nothing unless cached resource tree is processed - it will overwrite everything.
         if (!this._cachedResourcesProcessed && parentFrameId)
             return null;
-        if (this._frames[frameId])
+        if (this._frames.has(frameId))
             return null;
 
-        var parentFrame = parentFrameId ? this._frames[parentFrameId] : null;
+        var parentFrame = parentFrameId ? (this._frames.get(parentFrameId) || null) : null;

[lushnikov, 2016/07/20 03:02:50]

probably this could be written as

var parentFrame = this._frames.get(parentFrameId) || null;

though it's not identical to the previous code

[kozy, 2016/07/20 17:55:18]

.get method for Map<string, *> can be called only with string, so I need this
logic to make compiler happy.

         var frame = new WebInspector.ResourceTreeFrame(this, parentFrame, frameId);
         if (frame.isMainFrame() && this.mainFrame) {
             this._handleMainFrameDetached(this.mainFrame);
             // Navigation to the new backend process.
             this._frameDetached(this.mainFrame.id);
         }
         this._addFrame(frame, true);
         return frame;
     },
 
     /**
      * @param {!PageAgent.Frame} framePayload
      */
     _frameNavigated: function(framePayload)
     {
         // Do nothing unless cached resource tree is processed - it will overwrite everything.
         if (!this._cachedResourcesProcessed && framePayload.parentId)
             return;
-        var frame = this._frames[framePayload.id];
+        var frame = this._frames.get(framePayload.id);
         if (!frame) {
             // Simulate missed "frameAttached" for a main frame navigation to the new backend process.
             console.assert(!framePayload.parentId, "Main frame shouldn't have parent frame id.");
             frame = this._frameAttached(framePayload.id, framePayload.parentId || "");
             console.assert(frame);
         }
 
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameWillNavigate, frame);
 
         this._removeSecurityOrigin(frame.securityOrigin);
@@ skipping 25 matching lines @@
 
     /**
      * @param {!PageAgent.FrameId} frameId
      */
     _frameDetached: function(frameId)
     {
         // Do nothing unless cached resource tree is processed - it will overwrite everything.
         if (!this._cachedResourcesProcessed)
             return;
 
-        var frame = this._frames[frameId];
+        var frame = this._frames.get(frameId);
         if (!frame)
             return;
 
         this._removeSecurityOrigin(frame.securityOrigin);
         if (frame.parentFrame)
             frame.parentFrame._removeChildFrame(frame);
         else
             frame._remove();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onRequestFinished: function(event)
     {
         if (!this._cachedResourcesProcessed)
             return;
 
         var request = /** @type {!WebInspector.NetworkRequest} */ (event.data);
         if (request.failed || request.resourceType() === WebInspector.resourceTypes.XHR)
             return;
 
-        var frame = this._frames[request.frameId];
+        var frame = this._frames.get(request.frameId);
         if (frame)
             frame._addRequest(request);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onRequestUpdateDropped: function(event)
     {
         if (!this._cachedResourcesProcessed)
             return;
 
         var frameId = event.data.frameId;
-        var frame = this._frames[frameId];
+        var frame = this._frames.get(frameId);
         if (!frame)
             return;
 
         var url = event.data.url;
         if (frame._resourcesMap[url])
             return;
 
         var resource = new WebInspector.Resource(this.target(), null, url, frame.url, frameId, event.data.loaderId, WebInspector.resourceTypes[event.data.resourceType], event.data.mimeType);
         frame.addResource(resource);
     },
 
     /**
      * @param {!PageAgent.FrameId} frameId
      * @return {!WebInspector.ResourceTreeFrame}
      */
     frameForId: function(frameId)
     {
-        return this._frames[frameId];
+        return this._frames.get(frameId);
     },
 
     /**
      * @param {function(!WebInspector.Resource)} callback
      * @return {boolean}
      */
     forAllResources: function(callback)
     {
         if (this.mainFrame)
             return this.mainFrame._callForFrameResources(callback);
         return false;
     },
 
     /**
-     * @return {!Array.<!WebInspector.ResourceTreeFrame>}
+     * @return {!Array<!WebInspector.ResourceTreeFrame>}
      */
     frames: function()
     {
-        return Object.values(this._frames);
+        return Array.from(this._frames.values());

[lushnikov, 2016/07/20 03:02:50]

this._frames.valuesArray()

[kozy, 2016/07/20 17:55:18]

Done.

     },
 
     /**
      * @param {string} url
      * @return {?WebInspector.Resource}
      */
     resourceForURL: function(url)
     {
         // Workers call into this with no frames available.
         return this.mainFrame ? this.mainFrame.resourceForURL(url) : null;
@@ skipping 313 matching lines @@
     {
         var frames = this._childFrames;
         this._childFrames = [];
         for (var i = 0; i < frames.length; ++i)
             frames[i]._remove();
     },
 
     _remove: function()
     {
         this._removeChildFrames();
-        delete this._model._frames[this.id];
+        this._model._frames.delete(this.id);
         this._model.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this);
     },
 
     /**
      * @param {!WebInspector.Resource} resource
      */
     addResource: function(resource)
     {
         if (this._resourcesMap[resource.url] === resource) {
             // Already in the tree, we just got an extra update.
@@ skipping 246 matching lines @@
 
     /**
      * @override
      */
     navigationRequested: function()
     {
        // Frontend is not interested in interstitials.
     }
 
 }