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

third_party/WebKit/Source/devtools/front_end/snippets/SnippetStorage.js

 /*
  * Copyright (C) 2012 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
  * @extends {WebInspector.Object}
  */
 WebInspector.SnippetStorage = function(settingPrefix, namePrefix)
 {
-    this._snippets = {};
+    /** @type {!Map<string,!WebInspector.Snippet>} */
+    this._snippets = new Map();
 
     this._lastSnippetIdentifierSetting = WebInspector.settings.createSetting(settingPrefix + "Snippets_lastIdentifier", 0);
     this._snippetsSetting = WebInspector.settings.createSetting(settingPrefix + "Snippets", []);
     this._namePrefix = namePrefix;
 
     this._loadSettings();
 }
 
 WebInspector.SnippetStorage.prototype = {
     get namePrefix()
     {
         return this._namePrefix;
     },
 
     _saveSettings: function()
     {
         var savedSnippets = [];
-        for (var id in this._snippets)
-            savedSnippets.push(this._snippets[id].serializeToObject());
+        for (var snippet of this._snippets.values())
+            savedSnippets.push(snippet.serializeToObject());
         this._snippetsSetting.set(savedSnippets);
     },
 
     /**
-     * @return {!Array.<!WebInspector.Snippet>}
+     * @return {!Array<!WebInspector.Snippet>}
      */
     snippets: function()
     {
-        var result = [];
-        for (var id in this._snippets)
-            result.push(this._snippets[id]);
-        return result;
+        return Array.from(this._snippets.values());

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

valuesArray

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

Done.

     },
 
     /**
      * @param {string} id
-     * @return {!WebInspector.Snippet}
+     * @return {?WebInspector.Snippet}
      */
     snippetForId: function(id)
     {
-        return this._snippets[id];
+        return this._snippets.get(id);
     },
 
     /**
      * @param {string} name
      * @return {?WebInspector.Snippet}
      */
     snippetForName: function(name)
     {
-        var snippets = Object.values(this._snippets);
-        for (var i = 0; i < snippets.length; ++i)
-            if (snippets[i].name === name)
-                return snippets[i];
+        for (var snippet of this._snippets.values())

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

braces are missing

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

Done.

+            if (snippet.name === name)
+                return snippet;
         return null;
     },
 
     _loadSettings: function()
     {
         var savedSnippets = this._snippetsSetting.get();
         for (var i = 0; i < savedSnippets.length; ++i)
             this._snippetAdded(WebInspector.Snippet.fromObject(this, savedSnippets[i]));
     },
 
     /**
      * @param {!WebInspector.Snippet} snippet
      */
     deleteSnippet: function(snippet)
     {
-        delete this._snippets[snippet.id];
+        this._snippets.delete(snippet.id);
         this._saveSettings();
     },
 
     /**
      * @return {!WebInspector.Snippet}
      */
     createSnippet: function()
     {
         var nextId = this._lastSnippetIdentifierSetting.get() + 1;
         var snippetId = String(nextId);
         this._lastSnippetIdentifierSetting.set(nextId);
         var snippet = new WebInspector.Snippet(this, snippetId);
         this._snippetAdded(snippet);
         this._saveSettings();
         return snippet;
     },
 
     /**
      * @param {!WebInspector.Snippet} snippet
      */
     _snippetAdded: function(snippet)
     {
-        this._snippets[snippet.id] = snippet;
+        this._snippets.set(snippet.id, snippet);
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.Object}
  * @param {!WebInspector.SnippetStorage} storage
  * @param {string} id
@@ skipping 68 matching lines @@
     {
         var serializedSnippet = {};
         serializedSnippet.id = this.id;
         serializedSnippet.name = this.name;
         serializedSnippet.content = this.content;
         return serializedSnippet;
     },
 
     __proto__: WebInspector.Object.prototype
 }