[DevTools] No longer store security origins in ResourceTreeModel

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

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  * @implements {WebInspector.TargetManager.Observer}
  * @param {!WebInspector.ResourcesPanel} resourcesPanel
  */
@@ skipping 52 matching lines @@
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         if (this._target)
             return;
         this._target = target;
-        this._updateOrigin(target.resourceTreeModel.mainFrame ? target.resourceTreeModel.mainFrame.url : "");
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+        this._updateOrigin((resourceTreeModel && resourceTreeModel.mainFrame) ? resourceTreeModel.mainFrame.url : "");

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

We should use securityOriginManager.mainSecurityOrigin() here.

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

Done.

         WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._updateFrame, this);

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

And listen to SecurityOriginChanged event.

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

Done.

     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _updateFrame: function(event)
     {
         var frame = /** *@type {!WebInspector.ResourceTreeFrame} */ (event.data);
         this._updateOrigin(frame.url);
     },
@@ skipping 39 matching lines @@
         if (set.has(StorageAgent.StorageType.Websql) || hasAll) {
             var databaseModel = WebInspector.DatabaseModel.fromTarget(this._target);
             if (databaseModel) {
                 databaseModel.disable();
                 databaseModel.enable();
             }
         }
 
         if (set.has(StorageAgent.StorageType.Cache_storage) || hasAll) {
             var target = WebInspector.targetManager.mainTarget();
-            if (target) {
-                var model = WebInspector.ServiceWorkerCacheModel.fromTarget(target);
-                if (model)
-                    model.clearForOrigin(this._securityOrigin);
-            }
+            var model = target && WebInspector.ServiceWorkerCacheModel.fromTarget(target);
+            if (model)
+                model.clearForOrigin(this._securityOrigin);
         }
 
         if (set.has(StorageAgent.StorageType.Appcache) || hasAll) {
             var appcacheModel = WebInspector.ApplicationCacheModel.fromTarget(this._target);
             if (appcacheModel)
                 appcacheModel.reset();
         }
 
         this._clearButton.disabled = true;
         this._clearButton.textContent = WebInspector.UIString("Clearing...");
         setTimeout(() => {
             this._clearButton.disabled = false;
             this._clearButton.textContent = WebInspector.UIString("Clear selected");
         }, 500);
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
     },
 
     __proto__: WebInspector.VBox.prototype
 }