[DevTools] No longer store security origins in ResourceTreeModel

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

 /*
  * Copyright (C) 2008 Nokia Inc.  All rights reserved.
  * 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
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 92 matching lines @@
         this._model._agent.removeDOMStorageItem(this.id, key);
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.SDKModel}
  * @param {!WebInspector.Target} target
+ * @param {!WebInspector.SecurityOriginManager} securityOriginManager
  */
-WebInspector.DOMStorageModel = function(target)
+WebInspector.DOMStorageModel = function(target, securityOriginManager)
 {
     WebInspector.SDKModel.call(this, WebInspector.DOMStorageModel, target);
 
+    this._securityOriginManager = securityOriginManager;
     /** @type {!Object.<string, !WebInspector.DOMStorage>} */
     this._storages = {};
     this._agent = target.domstorageAgent();
 }
 
 WebInspector.DOMStorageModel.Events = {
     DOMStorageAdded: "DOMStorageAdded",
     DOMStorageRemoved: "DOMStorageRemoved"
 }
 
 WebInspector.DOMStorageModel.prototype = {
     enable: function()
     {
         if (this._enabled)
             return;
 
         this.target().registerDOMStorageDispatcher(new WebInspector.DOMStorageDispatcher(this));
-        this.target().resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginAdded, this._securityOriginAdded, this);
-        this.target().resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginRemoved, this._securityOriginRemoved, this);
+        this._securityOriginManager.addEventListener(WebInspector.SecurityOriginManager.EventTypes.SecurityOriginAdded, this._securityOriginAdded, this);
+        this._securityOriginManager.addEventListener(WebInspector.SecurityOriginManager.EventTypes.SecurityOriginRemoved, this._securityOriginRemoved, this);
+
+        for (var securityOrigin of this._securityOriginManager.securityOrigins())
+            this._addOrigin(securityOrigin);
         this._agent.enable();
 
-        var securityOrigins = this.target().resourceTreeModel.securityOrigins();
-        for (var i = 0; i < securityOrigins.length; ++i)
-            this._addOrigin(securityOrigins[i]);
-
         this._enabled = true;
     },
 
     /**
      * @param {string} origin
      */
     clearForOrigin: function(origin)
     {
         if (!this._enabled)
             return;
@@ skipping 193 matching lines @@
      * @param {string} oldValue
      * @param {string} value
      */
     domStorageItemUpdated: function(storageId, key, oldValue, value)
     {
         this._model._domStorageItemUpdated(storageId, key, oldValue, value);
     },
 }
 
 WebInspector.DOMStorageModel._symbol = Symbol("DomStorage");
+
 /**
  * @param {!WebInspector.Target} target
  * @return {!WebInspector.DOMStorageModel}
  */
 WebInspector.DOMStorageModel.fromTarget = function(target)
 {
-    if (!target[WebInspector.DOMStorageModel._symbol])
-        target[WebInspector.DOMStorageModel._symbol] = new WebInspector.DOMStorageModel(target);
+    if (!target[WebInspector.DOMStorageModel._symbol]) {
+        target[WebInspector.DOMStorageModel._symbol] = new WebInspector.DOMStorageModel(target, WebInspector.SecurityOriginManager.fromTarget(target));

[dgozman, 2016/07/25 18:56:08]

Let's use target.model().

[eostroukhov-old, 2016/07/25 19:47:48]

Done.

+    }
 
     return target[WebInspector.DOMStorageModel._symbol];
 }