[DevTools] Restore tree selection after reload

third_party/WebKit/Source/devtools/front_end/resources/ApplicationPanelSidebar.js

 /*
  * Copyright (C) 2007, 2008, 2010 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  * Copyright (C) 2013 Samsung Electronics. 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 26 matching lines @@
    */
   constructor(panel) {
     super();
 
     this._panel = panel;
 
     this._sidebarTree = new UI.TreeOutlineInShadow();
     this._sidebarTree.element.classList.add('resources-sidebar');
     this._sidebarTree.registerRequiredCSS('resources/resourcesSidebar.css');
     this._sidebarTree.element.classList.add('filter-all');
+    // Listener needs to have been set up before the elements are added
+    this._sidebarTree.addEventListener(UI.TreeOutline.Events.ElementAttached, this._treeElementAdded, this);
+
     this.contentElement.appendChild(this._sidebarTree.element);
-
     this._applicationTreeElement = this._addSidebarSection(Common.UIString('Application'));
     this._manifestTreeElement = new Resources.AppManifestTreeElement(panel);
     this._applicationTreeElement.appendChild(this._manifestTreeElement);
     this.serviceWorkersTreeElement = new Resources.ServiceWorkersTreeElement(panel);
     this._applicationTreeElement.appendChild(this.serviceWorkersTreeElement);
     var clearStorageTreeElement = new Resources.ClearStorageTreeElement(panel);
     this._applicationTreeElement.appendChild(clearStorageTreeElement);
 
     var storageTreeElement = this._addSidebarSection(Common.UIString('Storage'));
     this.localStorageListTreeElement =
@@ skipping 37 matching lines @@
     this._databaseTableViews = new Map();
     /** @type {!Map.<!Resources.Database, !Resources.DatabaseQueryView>} */
     this._databaseQueryViews = new Map();
     /** @type {!Map.<!Resources.Database, !Resources.DatabaseTreeElement>} */
     this._databaseTreeElements = new Map();
     /** @type {!Map.<!Resources.DOMStorage, !Resources.DOMStorageTreeElement>} */
     this._domStorageTreeElements = new Map();
     /** @type {!Object.<string, boolean>} */
     this._domains = {};
 
+    this._shouldRestoreSelection = true;
+
     this._sidebarTree.contentElement.addEventListener('mousemove', this._onmousemove.bind(this), false);
     this._sidebarTree.contentElement.addEventListener('mouseleave', this._onmouseleave.bind(this), false);
 
     SDK.targetManager.observeTargets(this);
     SDK.targetManager.addModelListener(
         SDK.ResourceTreeModel, SDK.ResourceTreeModel.Events.FrameNavigated, this._frameNavigated, this);
+    SDK.targetManager.addModelListener(
+        SDK.ResourceTreeModel, SDK.ResourceTreeModel.Events.WillReloadPage, this._willReloadPage, this);
   }
 
   /**
    * @param {string} title
    * @return {!UI.TreeElement}
    */
   _addSidebarSection(title) {
     var treeElement = new UI.TreeElement(title, true);
     treeElement.listItemElement.classList.add('storage-group-list-item');
     treeElement.setCollapsible(false);
@@ skipping 68 matching lines @@
       cacheStorageModel.enable();
     var resourceTreeModel = this._target.model(SDK.ResourceTreeModel);
     if (resourceTreeModel)
       this._populateApplicationCacheTree(resourceTreeModel);
     var domStorageModel = this._target.model(Resources.DOMStorageModel);
     if (domStorageModel)
       this._populateDOMStorageTree(domStorageModel);
     this.indexedDBListTreeElement._initialize();
     var serviceWorkerCacheModel = this._target.model(SDK.ServiceWorkerCacheModel);
     this.cacheStorageListTreeElement._initialize(serviceWorkerCacheModel);
-    this._initDefaultSelection();
-  }
-
-  _initDefaultSelection() {
-    var itemURL = this._panel.lastSelectedItemURL();
-    if (itemURL) {
-      var rootElement = this._sidebarTree.rootElement();
-      for (var treeElement = rootElement.firstChild(); treeElement;
-           treeElement = treeElement.traverseNextTreeElement(false, rootElement, true)) {
-        if (treeElement.itemURL === itemURL) {
-          treeElement.revealAndSelect(true);
-          return;
-        }
-      }
-    }
-    this._manifestTreeElement.select();
   }
 
   _resetWithFrames() {
     this._resourcesSection.reset();
     this._reset();
   }
 
   _resetWebSQL() {
     var queryViews = this._databaseQueryViews.valuesArray();
     for (var i = 0; i < queryViews.length; ++i) {
       queryViews[i].removeEventListener(
           Resources.DatabaseQueryView.Events.SchemaUpdated, this._updateDatabaseTables, this);
     }
     this._databaseTableViews.clear();
     this._databaseQueryViews.clear();
     this._databaseTreeElements.clear();
     this.databasesListTreeElement.removeChildren();
     this.databasesListTreeElement.setExpandable(false);
   }
 
   _resetAppCache() {
     for (var frameId of Object.keys(this._applicationCacheFrameElements))
       this._applicationCacheFrameManifestRemoved({data: frameId});
     this.applicationCacheListTreeElement.setExpandable(false);
   }
 
+  _willReloadPage() {
+    this._shouldRestoreSelection = true;
+  }
+
+  /**
+   * @param {!Common.Event} event
+   */
+  _treeElementAdded(event) {
+    if (!this._shouldRestoreSelection)
+      return;
+    var selection = this._panel.lastSelectedItemPath();
+    if (!selection.length)
+      return;
+    var element = event.data;
+    var index = selection.indexOf(element.itemURL);
+    if (index > 0)
+      element.expand();
+    if (index)
+      return;
+    for (var parent = element.parent; parent; parent = parent.parent)
+      parent.expand();
+    element.select();
+    this._shouldRestoreSelection = false;
+  }
+
   _reset() {
     this._domains = {};
     this._resetWebSQL();
     this.cookieListTreeElement.removeChildren();
   }
 
   _frameNavigated(event) {
     var frame = event.data;
 
     if (!frame.parentFrame)
@@ skipping 339 matching lines @@
     this._storagePanel = storagePanel;
   }
 
   /**
    * @override
    * @return {boolean}
    */
   onselect(selectedByUser) {
     if (!selectedByUser)
       return false;
-    var itemURL = this.itemURL;
-    if (itemURL)
-      this._storagePanel.setLastSelectedItemURL(itemURL);
+
+    var path = [];
+    for (var el = this; el; el = el.parent) {
+      var url = el.itemURL;
+      if (!url)
+        break;
+      path.push(url);
+    }
+    this._storagePanel.setLastSelectedItemPath(path);
+
     return false;
   }
 
   /**
    * @protected
    * @param {?UI.Widget} view
    */
   showView(view) {
     this._storagePanel.showView(view);
   }
@@ skipping 625 matching lines @@
     this.removeChild(objectStoreTreeElement);
     delete this._idbObjectStoreTreeElements[objectStoreName];
   }
 
   clear() {
     for (var objectStoreName in this._idbObjectStoreTreeElements)
       this._objectStoreRemoved(objectStoreName);
   }
 };
 
-/**
- * @unrestricted
- */
 Resources.IDBObjectStoreTreeElement = class extends Resources.BaseStorageTreeElement {
   /**
    * @param {!Resources.ResourcesPanel} storagePanel
    * @param {!Resources.IndexedDBModel} model
    * @param {!Resources.IndexedDBModel.DatabaseId} databaseId
    * @param {!Resources.IndexedDBModel.ObjectStore} objectStore
    */
   constructor(storagePanel, model, databaseId, objectStore) {
     super(storagePanel, objectStore.name, false);
     this._model = model;
     this._databaseId = databaseId;
     this._idbIndexTreeElements = {};
+    this._objectStore = objectStore;
+    /** @type {?Resources.IDBDataView} */
+    this._view = null;
     var icon = UI.Icon.create('mediumicon-table', 'resource-tree-item');
     this.setLeadingIcons([icon]);
   }
 
   get itemURL() {
     return 'indexedDB://' + this._databaseId.securityOrigin + '/' + this._databaseId.name + '/' +
         this._objectStore.name;
   }
 
   /**
@@ skipping 46 matching lines @@
       if (!indexNames[indexName]) {
         this.removeChild(this._idbIndexTreeElements[indexName]);
         delete this._idbIndexTreeElements[indexName];
       }
     }
 
     if (this.childCount())
       this.expand();
 
     if (this._view)
-      this._view.update(this._objectStore);
+      this._view.update(this._objectStore, null);
 
     this._updateTooltip();
   }
 
   _updateTooltip() {
     var keyPathString = this._objectStore.keyPathString;
     var tooltipString = keyPathString !== null ? (Common.UIString('Key path: ') + keyPathString) : '';
     if (this._objectStore.autoIncrement)
       tooltipString += '\n' + Common.UIString('autoIncrement');
     this.tooltip = tooltipString;
@@ skipping 285 matching lines @@
 
     this.element.classList.add('storage-view');
     this._emptyWidget = new UI.EmptyWidget('');
     this._emptyWidget.show(this.element);
   }
 
   setText(text) {
     this._emptyWidget.text = text;
   }
 };