DevTools: Fixes to Storage panel inconsistencies

third_party/WebKit/Source/devtools/front_end/cookie_table/CookiesTable.js

 /*
  * Copyright (C) 2009 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  * Copyright (C) 2010 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
@@ skipping 18 matching lines @@
  */
 
 /**
  * @unrestricted
  */
 CookieTable.CookiesTable = class extends UI.VBox {
   /**
    * @param {function(!SDK.Cookie, ?SDK.Cookie, function(?string))=} saveCallback
    * @param {function()=} refreshCallback
    * @param {function()=} selectedCallback
+   * @param {function(!SDK.Cookie, function())=} deleteCallback
    * @param {string=} cookieDomain
    */
-  constructor(saveCallback, refreshCallback, selectedCallback, cookieDomain) {
+  constructor(saveCallback, refreshCallback, selectedCallback, deleteCallback, cookieDomain) {
     super();
 
     this._saveCallback = saveCallback;
     this._refreshCallback = refreshCallback;
+    this._deleteCallback = deleteCallback;
     this._cookieDomain = cookieDomain;
 
     var editable = !!saveCallback;
 
     var columns = /** @type {!Array<!DataGrid.DataGrid.ColumnDescriptor>} */ ([
       {
         id: 'name',
         title: Common.UIString('Name'),
         sortable: true,
         disclosure: editable,
@@ skipping 35 matching lines @@
     } else {
       this._dataGrid = new DataGrid.DataGrid(columns);
     }
 
     this._dataGrid.setName('cookiesTable');
     this._dataGrid.addEventListener(DataGrid.DataGrid.Events.SortingChanged, this._rebuildTable, this);
 
     if (selectedCallback)
       this._dataGrid.addEventListener(DataGrid.DataGrid.Events.SelectedNode, selectedCallback, this);
 
-    this._nextSelectedCookie = /** @type {?SDK.Cookie} */ (null);
     /** @type {?string} */
     this._lastEditedColumnId = null;
 
     this._dataGrid.asWidget().show(this.element);
     this._data = [];
   }
 
   /**
    * @param {!Array.<!SDK.Cookie>} cookies
    */
@@ skipping 11 matching lines @@
 
   /**
    * @return {?SDK.Cookie}
    */
   selectedCookie() {
     var node = this._dataGrid.selectedNode;
     return node ? node.cookie : null;
   }
 
   /**
+   * @return {{current: ?SDK.Cookie, neighbor: ?SDK.Cookie}}
+   */
+  _getSelectionCookies() {
+    var node = this._dataGrid.selectedNode;
+    var neighbor = node && (node.traverseNextNode(true) || node.traversePreviousNode(true));
+
+    return {current: node && node.cookie, neighbor: neighbor && neighbor.cookie};
+  }
+
+  /**
    * @override
    */
   willHide() {
     this._lastEditedColumnId = null;
   }
 
+  /**
+   * @param {{current: ?SDK.Cookie, neighbor: ?SDK.Cookie}} selectionCookies
+   * @param {!Array<!SDK.Cookie>} cookies
+   * @return {?SDK.Cookie}
+   */
+  _findSelectedCookie(selectionCookies, cookies) {
+    var current = selectionCookies.current;
+    var foundCurrent = cookies.find(cookie => this._isSameCookie(cookie, current));
+    if (foundCurrent)
+      return foundCurrent;
+
+    var neighbor = selectionCookies.neighbor;
+    var foundNeighbor = cookies.find(cookie => this._isSameCookie(cookie, neighbor));
+    if (foundNeighbor)
+      return foundNeighbor;
+
+    return null;
+  }
+
+  /**
+   * @param {!SDK.Cookie} cookieA
+   * @param {?SDK.Cookie} cookieB
+   * @return {boolean}
+   */
+  _isSameCookie(cookieA, cookieB) {
+    return !!cookieB && cookieB.name() === cookieA.name() && cookieB.domain() === cookieA.domain() &&
+        cookieB.path() === cookieA.path();
+  }
+
   _rebuildTable() {
-    var selectedCookie = this._nextSelectedCookie || this.selectedCookie();
+    var selectionCookies = this._getSelectionCookies();
     var lastEditedColumnId = this._lastEditedColumnId;
-    this._nextSelectedCookie = null;
     this._lastEditedColumnId = null;
     this._dataGrid.rootNode().removeChildren();
     for (var i = 0; i < this._data.length; ++i) {
       var item = this._data[i];
+      var selectedCookie = this._findSelectedCookie(selectionCookies, item.cookies);
       if (item.folderName) {
         var groupData = {
           name: item.folderName,
           value: '',
           domain: '',
           path: '',
           expires: '',
           size: this._totalSize(item.cookies),
           httpOnly: '',
           secure: '',
@@ skipping 24 matching lines @@
   _populateNode(parentNode, cookies, selectedCookie, lastEditedColumnId) {
     parentNode.removeChildren();
     if (!cookies)
       return;
 
     this._sortCookies(cookies);
     for (var i = 0; i < cookies.length; ++i) {
       var cookie = cookies[i];
       var cookieNode = this._createGridNode(cookie);
       parentNode.appendChild(cookieNode);
-      if (selectedCookie && selectedCookie.name() === cookie.name() && selectedCookie.domain() === cookie.domain() &&
-          selectedCookie.path() === cookie.path()) {
+      if (this._isSameCookie(cookie, selectedCookie)) {
         cookieNode.select();
         if (lastEditedColumnId !== null)
           this._dataGrid.startEditingNextEditableColumnOfDataGridNode(cookieNode, lastEditedColumnId);
       }
     }
   }
 
   /**
    * @param {!DataGrid.DataGridNode} parentNode
    * @param {!SDK.Cookie} cookie
@@ skipping 103 matching lines @@
     data.httpOnly = (cookie.httpOnly() ? checkmark : '');
     data.secure = (cookie.secure() ? checkmark : '');
     data.sameSite = cookie.sameSite() || '';
 
     var node = new DataGrid.DataGridNode(data);
     node.cookie = cookie;
     node.selectable = true;
     return node;
   }
 
+  /**
+   * @param {!DataGrid.DataGridNode} node
+   */
   _onDeleteCookie(node) {
-    var cookie = node.cookie;
-    var neighbour = node.traverseNextNode() || node.traversePreviousNode();
-    if (neighbour)
-      this._nextSelectedCookie = neighbour.cookie;
-    cookie.remove();
-    this._refresh();
+    if (node.cookie && this._deleteCallback)
+      this._deleteCallback(node.cookie, () => this._refresh());
   }
 
   /**
    * @param {!DataGrid.DataGridNode} editingNode
    * @param {string} columnIdentifier
    * @param {string} oldText
    * @param {string} newText
    */
   _onUpdateCookie(editingNode, columnIdentifier, oldText, newText) {
     this._lastEditedColumnId = columnIdentifier;
@@ skipping 26 matching lines @@
   _saveNode(node) {
     var oldCookie = node.cookie;
     var newCookie = this._createCookieFromData(node.data);
     node.cookie = newCookie;
     this._saveCallback(newCookie, oldCookie, error => {
       if (!error)
         this._refresh();
       else
         node.setDirty(true);
     });
-    this._nextSelectedCookie = newCookie;
   }
 
   /**
    * @param {!Object.<string, *>} data
    * @returns {!SDK.Cookie}
    */
   _createCookieFromData(data) {
     var cookie = new SDK.Cookie(data.name, data.value, null);
     cookie.addAttribute('domain', data.domain);
     cookie.addAttribute('path', data.path);
@@ skipping 47 matching lines @@
   }
 
   _refresh() {
     if (this._refreshCallback)
       this._refreshCallback();
   }
 };
 
 /** @const */
 CookieTable.CookiesTable._expiresSessionValue = Common.UIString('Session');