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

third_party/WebKit/Source/devtools/front_end/bindings/BreakpointManager.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 465 matching lines @@
  */
 WebInspector.BreakpointManager.Breakpoint = function(breakpointManager, projectId, path, sourceFileId, lineNumber, columnNumber, condition, enabled)
 {
     this._breakpointManager = breakpointManager;
     this._projectId = projectId;
     this._path = path;
     this._lineNumber = lineNumber;
     this._columnNumber = columnNumber;
     this._sourceFileId = sourceFileId;
 
-    /** @type {!Object.<string, number>} */
-    this._numberOfDebuggerLocationForUILocation = {};
+    /** @type {!Map<string, number>} */
+    this._numberOfDebuggerLocationForUILocation = new Map();
 
     // Force breakpoint update.
     /** @type {string} */ this._condition;
     /** @type {boolean} */ this._enabled;
     /** @type {boolean} */ this._isRemoved;
     /** @type {!WebInspector.UILocation|undefined} */ this._fakePrimaryLocation;
 
     this._currentState = null;
     /** @type {!Map.<!WebInspector.Target, !WebInspector.BreakpointManager.TargetBreakpoint>}*/
     this._targetBreakpoints = new Map();
@@ skipping 75 matching lines @@
      * @param {!WebInspector.UILocation} newUILocation
      */
     _replaceUILocation: function(oldUILocation, newUILocation)
     {
         if (this._isRemoved)
             return;
 
         this._removeUILocation(oldUILocation, true);
         this._removeFakeBreakpointAtPrimaryLocation();
 
-        if (!this._numberOfDebuggerLocationForUILocation[newUILocation.id()])
-            this._numberOfDebuggerLocationForUILocation[newUILocation.id()] = 0;
-
-        if (++this._numberOfDebuggerLocationForUILocation[newUILocation.id()] === 1)
+        var current = (this._numberOfDebuggerLocationForUILocation.get(newUILocation.id()) || 0) + 1;
+        this._numberOfDebuggerLocationForUILocation.set(newUILocation.id(), current);
+        if (current === 1)
             this._breakpointManager._uiLocationAdded(this, newUILocation);
     },
 
     /**
      * @param {?WebInspector.UILocation} uiLocation
      * @param {boolean=} muteCreationFakeBreakpoint
      */
     _removeUILocation: function(uiLocation, muteCreationFakeBreakpoint)
     {
-        if (!uiLocation || --this._numberOfDebuggerLocationForUILocation[uiLocation.id()] !== 0)
+        if (!uiLocation || !this._numberOfDebuggerLocationForUILocation.has(uiLocation.id()))
+            return;
+        var current = (this._numberOfDebuggerLocationForUILocation.get(uiLocation.id()) || 0) - 1;

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

you can drop || 0

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

I can, but then I'll need to add type cast.

+        this._numberOfDebuggerLocationForUILocation.set(uiLocation.id(), current);
+        if (current !== 0)
             return;
 
-        delete this._numberOfDebuggerLocationForUILocation[uiLocation.id()];
+        this._numberOfDebuggerLocationForUILocation.delete(uiLocation.id());
         this._breakpointManager._uiLocationRemoved(this, uiLocation);
         if (!muteCreationFakeBreakpoint)
             this._fakeBreakpointAtPrimaryLocation();
     },
 
     /**
      * @return {boolean}
      */
     enabled: function()
     {
@@ skipping 77 matching lines @@
     /**
      * @return {string}
      */
     _breakpointStorageId: function()
     {
         return WebInspector.BreakpointManager._breakpointStorageId(this._sourceFileId, this._lineNumber, this._columnNumber);
     },
 
     _fakeBreakpointAtPrimaryLocation: function()
     {
-        if (this._isRemoved || !Object.isEmpty(this._numberOfDebuggerLocationForUILocation) || this._fakePrimaryLocation)
+        if (this._isRemoved || this._numberOfDebuggerLocationForUILocation.size || this._fakePrimaryLocation)
             return;
 
         var uiSourceCode = this._breakpointManager._workspace.uiSourceCode(this._projectId, this._path);
         if (!uiSourceCode)
             return;
 
         this._fakePrimaryLocation = uiSourceCode.uiLocation(this._lineNumber, this._columnNumber);
         if (this._fakePrimaryLocation)
             this._breakpointManager._uiLocationAdded(this, this._fakePrimaryLocation);
     },
@@ skipping 26 matching lines @@
 WebInspector.BreakpointManager.TargetBreakpoint = function(debuggerModel, breakpoint, networkMapping, debuggerWorkspaceBinding)
 {
     WebInspector.SDKObject.call(this, debuggerModel.target());
     this._debuggerModel = debuggerModel;
     this._breakpoint = breakpoint;
     this._networkMapping = networkMapping;
     this._debuggerWorkspaceBinding = debuggerWorkspaceBinding;
 
     this._liveLocations = new WebInspector.LiveLocationPool();
 
-    /** @type {!Object.<string, !WebInspector.UILocation>} */
-    this._uiLocations = {};
+    /** @type {!Map<string, !WebInspector.UILocation>} */
+    this._uiLocations = new Map();
     this._debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasDisabled, this._cleanUpAfterDebuggerIsGone, this);
     this._debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._scheduleUpdateInDebugger, this);
     this._hasPendingUpdate = false;
     this._isUpdating = false;
     this._cancelCallback = false;
     this._currentState = null;
     if (this._debuggerModel.debuggerEnabled())
         this._scheduleUpdateInDebugger();
 }
 
 WebInspector.BreakpointManager.TargetBreakpoint.prototype = {
 
     _resetLocations: function()
     {
-        var uiLocations = Object.values(this._uiLocations);
-        for (var i = 0; i < uiLocations.length; ++i)
-            this._breakpoint._removeUILocation(uiLocations[i]);
+        for (var uiLocation of this._uiLocations.values())
+            this._breakpoint._removeUILocation(uiLocation);
 
-        this._uiLocations = {};
+        this._uiLocations.clear();
         this._liveLocations.disposeAll();
     },
 
     _scheduleUpdateInDebugger: function()
     {
         if (this._isUpdating) {
             this._hasPendingUpdate = true;
             return;
         }
 
@@ skipping 140 matching lines @@
 
     /**
      * @param {!WebInspector.DebuggerModel.Location} location
      * @param {!WebInspector.LiveLocation} liveLocation
      */
     _locationUpdated: function(location, liveLocation)
     {
         var uiLocation = liveLocation.uiLocation();
         if (!uiLocation)
             return;
-        var oldUILocation = this._uiLocations[location.id()] || null;
-        this._uiLocations[location.id()] = uiLocation;
+        var oldUILocation = this._uiLocations.get(location.id()) || null;
+        this._uiLocations.set(location.id(), uiLocation);
         this._breakpoint._replaceUILocation(oldUILocation, uiLocation);
     },
 
     /**
      * @param {!WebInspector.DebuggerModel.Location} location
      * @return {boolean}
      */
     _addResolvedLocation: function(location)
     {
         var uiLocation = this._debuggerWorkspaceBinding.rawLocationToUILocation(location);
@@ skipping 144 matching lines @@
 {
     this.sourceFileId = breakpoint._sourceFileId;
     this.lineNumber = breakpoint.lineNumber();
     this.columnNumber = breakpoint.columnNumber();
     this.condition = breakpoint.condition();
     this.enabled = breakpoint.enabled();
 }
 
 /** @type {!WebInspector.BreakpointManager} */
 WebInspector.breakpointManager;