[DevTools] No longer store security origins in ResourceTreeModel

third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.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 106 matching lines @@
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         if (this._target)
             return;
+
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+        if (!resourceTreeModel)

[dgozman, 2016/07/22 03:27:02]

This will break for service worker: all storage subviews can totally work with
just securityOriginManager and without resourceTreeModel.

[eostroukhov-old, 2016/07/22 23:27:43]

Done.

+            return;
+
         this._target = target;
         this._databaseModel = WebInspector.DatabaseModel.fromTarget(target);
-        this._domStorageModel = WebInspector.DOMStorageModel.fromTarget(target);
 
-        if (target.resourceTreeModel.cachedResourcesLoaded())
+        this._databaseModel.addEventListener(WebInspector.DatabaseModel.Events.DatabaseAdded, this._databaseAdded, this);
+        this._databaseModel.addEventListener(WebInspector.DatabaseModel.Events.DatabasesRemoved, this._resetWebSQL, this);
+
+        if (resourceTreeModel.cachedResourcesLoaded())
             this._initialize();
 
-        target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._initialize, this);
-        target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources, this._resetWithFrames, this);
-        this._databaseModel.addEventListener(WebInspector.DatabaseModel.Events.DatabaseAdded, this._databaseAdded, this);
-        this._databaseModel.addEventListener(WebInspector.DatabaseModel.Events.DatabasesRemoved, this._resetWebSQL, this);
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._initialize, this);
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources, this._resetWithFrames, this);
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
         if (target !== this._target)
             return;
         delete this._target;
 
-        target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._initialize, this);
-        target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources, this._resetWithFrames, this);
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+        if (resourceTreeModel) {
+            resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._initialize, this);
+            resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources, this._resetWithFrames, this);
+        }
         this._databaseModel.removeEventListener(WebInspector.DatabaseModel.Events.DatabaseAdded, this._databaseAdded, this);
         this._databaseModel.removeEventListener(WebInspector.DatabaseModel.Events.DatabasesRemoved, this._resetWebSQL, this);
 
         this._resetWithFrames();
     },
 
     _initialize: function()
     {
         this._databaseModel.enable();
-        this._domStorageModel.enable();
+        var domStorageModel = WebInspector.DOMStorageModel.fromTarget(this._target);
+        if (domStorageModel)
+            domStorageModel.enable();
         var indexedDBModel = WebInspector.IndexedDBModel.fromTarget(this._target);
         if (indexedDBModel)
             indexedDBModel.enable();
 
         var cacheStorageModel = WebInspector.ServiceWorkerCacheModel.fromTarget(this._target);
         if (cacheStorageModel)
             cacheStorageModel.enable();
 
         if (this._target.hasBrowserCapability())
             this._populateResourceTree();
         this._populateDOMStorageTree();

[dgozman, 2016/07/22 03:27:02]

Let's pass domStorageModel explicitly.

[eostroukhov-old, 2016/07/22 23:27:43]

Done.

         this._populateApplicationCacheTree();
         this.indexedDBListTreeElement._initialize();
         this.cacheStorageListTreeElement._initialize();
         this._initDefaultSelection();
     },
 
     _initDefaultSelection: function()
     {
         var itemURL = this._resourcesLastSelectedItemSetting.get();
         if (itemURL) {
@@ skipping 90 matching lines @@
 
         this._storageViewToolbar.removeToolbarItems();
 
         if (this._sidebarTree.selectedTreeElement)
             this._sidebarTree.selectedTreeElement.deselect();
     },
 
     _populateResourceTree: function()
     {
         this._treeElementForFrameId = {};
-        this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameAdded, this._frameAdded, this);
-        this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, this._frameNavigated, this);
-        this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this._frameDetached, this);
-        this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
+
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this._target);
+
+        if (!resourceTreeModel)
+            return;
+
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameAdded, this._frameAdded, this);
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, this._frameNavigated, this);
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this._frameDetached, this);
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
 
         /**
          * @param {!WebInspector.ResourceTreeFrame} frame
          * @this {WebInspector.ResourcesPanel}
          */
         function populateFrame(frame)
         {
             this._frameAdded({data:frame});
             for (var i = 0; i < frame.childFrames.length; ++i)
                 populateFrame.call(this, frame.childFrames[i]);
 
             var resources = frame.resources();
             for (var i = 0; i < resources.length; ++i)
                 this._resourceAdded({data:resources[i]});
         }
-        populateFrame.call(this, this._target.resourceTreeModel.mainFrame);
+        populateFrame.call(this, resourceTreeModel.mainFrame);
     },
 
     _frameAdded: function(event)
     {
         var frame = event.data;
         var parentFrame = frame.parentFrame;
 
         var parentTreeElement = parentFrame ? this._treeElementForFrameId[parentFrame.id] : this.resourcesListTreeElement;
         if (!parentTreeElement) {
             console.warn("No frame to route " + frame.url + " to.");
@@ skipping 377 matching lines @@
                         self.closeVisibleView();
                     delete tableViews[tableName];
                 }
             }
         }
         database.getTableNames(tableNamesCallback);
     },
 
     _populateDOMStorageTree: function()
     {
-        this._domStorageModel.storages().forEach(this._addDOMStorage.bind(this));
-        this._domStorageModel.addEventListener(WebInspector.DOMStorageModel.Events.DOMStorageAdded, this._domStorageAdded, this);
-        this._domStorageModel.addEventListener(WebInspector.DOMStorageModel.Events.DOMStorageRemoved, this._domStorageRemoved, this);
+        var domStorageModel = WebInspector.DOMStorageModel.fromTarget(this._target);
+        if (!domStorageModel)
+            return;
+        domStorageModel.storages().forEach(this._addDOMStorage.bind(this));
+        domStorageModel.addEventListener(WebInspector.DOMStorageModel.Events.DOMStorageAdded, this._domStorageAdded, this);
+        domStorageModel.addEventListener(WebInspector.DOMStorageModel.Events.DOMStorageRemoved, this._domStorageRemoved, this);
     },
 
     _populateApplicationCacheTree: function()
     {
         this._applicationCacheModel = new WebInspector.ApplicationCacheModel(this._target);
 
         this._applicationCacheViews = {};
         this._applicationCacheFrameElements = {};
         this._applicationCacheManifestElements = {};
 
@@ skipping 559 matching lines @@
 {
     WebInspector.StorageCategoryTreeElement.call(this, storagePanel, WebInspector.UIString("Cache Storage"), "CacheStorage", ["database-tree-item", "resource-tree-item"]);
 }
 
 WebInspector.ServiceWorkerCacheTreeElement.prototype = {
     _initialize: function()
     {
         /** @type {!Array.<!WebInspector.SWCacheTreeElement>} */
         this._swCacheTreeElements = [];
         var target = this._storagePanel._target;
-        if (target) {
-            var model = WebInspector.ServiceWorkerCacheModel.fromTarget(target);
-            var caches = model.caches();
-            for (var cache of caches)
+        var model = target && WebInspector.ServiceWorkerCacheModel.fromTarget(target);
+        if (model) {
+            for (var cache of model.caches())
                 this._addCache(model, cache);
         }
         WebInspector.targetManager.addModelListener(WebInspector.ServiceWorkerCacheModel, WebInspector.ServiceWorkerCacheModel.EventTypes.CacheAdded, this._cacheAdded, this);
         WebInspector.targetManager.addModelListener(WebInspector.ServiceWorkerCacheModel, WebInspector.ServiceWorkerCacheModel.EventTypes.CacheRemoved, this._cacheRemoved, this);
     },
 
     onattach: function()
     {
         WebInspector.StorageCategoryTreeElement.prototype.onattach.call(this);
         this.listItemElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), true);
     },
 
     _handleContextMenuEvent: function(event)
     {
         var contextMenu = new WebInspector.ContextMenu(event);
         contextMenu.appendItem(WebInspector.UIString("Refresh Caches"), this._refreshCaches.bind(this));
         contextMenu.show();
     },
 
     _refreshCaches: function()
     {
         var target = this._storagePanel._target;
         if (target) {
             var model = WebInspector.ServiceWorkerCacheModel.fromTarget(target);
-            model.refreshCacheNames();
+            if (model)
+                model.refreshCacheNames();
         }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _cacheAdded: function(event)
     {
         var cache = /** @type {!WebInspector.ServiceWorkerCacheModel.Cache} */ (event.data);
         var model = /** @type {!WebInspector.ServiceWorkerCacheModel} */ (event.target);
@@ skipping 240 matching lines @@
 
 WebInspector.IndexedDBTreeElement.prototype = {
     _initialize: function()
     {
         WebInspector.targetManager.addModelListener(WebInspector.IndexedDBModel, WebInspector.IndexedDBModel.EventTypes.DatabaseAdded, this._indexedDBAdded, this);
         WebInspector.targetManager.addModelListener(WebInspector.IndexedDBModel, WebInspector.IndexedDBModel.EventTypes.DatabaseRemoved, this._indexedDBRemoved, this);
         WebInspector.targetManager.addModelListener(WebInspector.IndexedDBModel, WebInspector.IndexedDBModel.EventTypes.DatabaseLoaded, this._indexedDBLoaded, this);
         /** @type {!Array.<!WebInspector.IDBDatabaseTreeElement>} */
         this._idbDatabaseTreeElements = [];
 
-        var targets = WebInspector.targetManager.targets();
+        var targets = WebInspector.targetManager.targets(WebInspector.Target.Capability.DOM);

[dgozman, 2016/07/22 03:27:02]

IndexedDB is not DOM, but Browser.

[eostroukhov-old, 2016/07/22 23:27:43]

Done.

         for (var i = 0; i < targets.length; ++i) {
             var indexedDBModel = WebInspector.IndexedDBModel.fromTarget(targets[i]);
+            if (!indexedDBModel)
+                continue;
             var databases = indexedDBModel.databases();
             for (var j = 0; j < databases.length; ++j)
                 this._addIndexedDB(indexedDBModel, databases[j]);
         }
     },
 
     onattach: function()
     {
         WebInspector.StorageCategoryTreeElement.prototype.onattach.call(this);
         this.listItemElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), true);
     },
 
     _handleContextMenuEvent: function(event)
     {
         var contextMenu = new WebInspector.ContextMenu(event);
         contextMenu.appendItem(WebInspector.UIString("Refresh IndexedDB"), this.refreshIndexedDB.bind(this));
         contextMenu.show();
     },
 
     refreshIndexedDB: function()
     {
-        var targets = WebInspector.targetManager.targets();
-        for (var i = 0; i < targets.length; ++i)
-            WebInspector.IndexedDBModel.fromTarget(targets[i]).refreshDatabaseNames();
+        var targets = WebInspector.targetManager.targets(WebInspector.Target.Capability.DOM);

[dgozman, 2016/07/22 03:27:02]

ditto

[eostroukhov-old, 2016/07/22 23:27:43]

Done.

+        for (var i = 0; i < targets.length; ++i) {
+            var indexedDBModel = WebInspector.IndexedDBModel.fromTarget(targets[i])
+            if (indexedDBModel)
+                indexedDBModel.refreshDatabaseNames();
+        }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _indexedDBAdded: function(event)
     {
         var databaseId = /** @type {!WebInspector.IndexedDBModel.DatabaseId} */ (event.data);
         var model = /** @type {!WebInspector.IndexedDBModel} */ (event.target);
         this._addIndexedDB(model, databaseId);
@@ skipping 520 matching lines @@
         return this._frameId;
     },
 
     get manifestURL()
     {
         return this._manifestURL;
     },
 
     _refreshTitles: function()
     {
-        var frame = this._storagePanel._target.resourceTreeModel.frameForId(this._frameId);
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this._storagePanel._target);
+        if (!resourceTreeModel)

[dgozman, 2016/07/22 03:27:02]

It cannot be null here.

[eostroukhov-old, 2016/07/22 23:27:43]

Done.

+            return;
+        var frame = resourceTreeModel.frameForId(this._frameId);
         this.title = frame.displayName();
     },
 
     frameNavigated: function()
     {
         this._refreshTitles();
     },
 
     /**
      * @override
@@ skipping 57 matching lines @@
 WebInspector.ResourcesPanelFactory.prototype = {
     /**
      * @override
      * @return {!WebInspector.Panel}
      */
     createPanel: function()
     {
         return WebInspector.ResourcesPanel._instance();
     }
 }