[DevTools] No longer store security origins in ResourceTreeModel

third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerCacheModel.js

 // Copyright 2014 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.
 
 /**
  * Invariant: This model can only be constructed on a ServiceWorker target.
  * @constructor
  * @extends {WebInspector.SDKModel}
+ * @param {!WebInspector.Target} target
+ * @param {!WebInspector.SecurityOriginManager} securityOriginManager
  */
-WebInspector.ServiceWorkerCacheModel = function(target)
+WebInspector.ServiceWorkerCacheModel = function(target, securityOriginManager)
 {
     WebInspector.SDKModel.call(this, WebInspector.ServiceWorkerCacheModel, target);
 
     /** @type {!Map<string, !WebInspector.ServiceWorkerCacheModel.Cache>} */
     this._caches = new Map();
 
     this._agent = target.cacheStorageAgent();
 
+    this._securityOriginManager = securityOriginManager;
+
     /** @type {boolean} */
     this._enabled = false;
 }
 
 WebInspector.ServiceWorkerCacheModel.EventTypes = {
     CacheAdded: "CacheAdded",
     CacheRemoved: "CacheRemoved"
 }
 
 WebInspector.ServiceWorkerCacheModel.prototype = {
     enable: function()
     {
         if (this._enabled)
             return;
 
-        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);
 
-        var securityOrigins = this.target().resourceTreeModel.securityOrigins();
+        var securityOrigins = this._securityOriginManager.securityOrigins();
         for (var i = 0; i < securityOrigins.length; ++i)
             this._addOrigin(securityOrigins[i]);
         this._enabled = true;
     },
 
     /**
      * @param {string} origin
      */
     clearForOrigin: function(origin)
     {
         this._removeOrigin(origin);
         this._addOrigin(origin);
     },
 
     refreshCacheNames: function()
     {
         for (var cache of this._caches.values())
             this._cacheRemoved(cache);
         this._caches.clear();
-        var securityOrigins = this.target().resourceTreeModel.securityOrigins();
+        var securityOrigins = this._securityOriginManager.securityOrigins();
         for (var securityOrigin of securityOrigins)
             this._loadCacheNames(securityOrigin);
     },
 
     /**
      * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
      */
     deleteCache: function(cache)
     {
         /**
@@ skipping 54 matching lines @@
             caches.push(cache);
         return caches;
     },
 
     dispose: function()
     {
         for (var cache of this._caches.values())
             this._cacheRemoved(cache);
         this._caches.clear();
         if (this._enabled) {
-            this.target().resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginAdded, this._securityOriginAdded, this);
-            this.target().resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginRemoved, this._securityOriginRemoved, this);
+            this._securityOriginManager.removeEventListener(WebInspector.SecurityOriginManager.EventTypes.SecurityOriginAdded, this._securityOriginAdded, this);
+            this._securityOriginManager.removeEventListener(WebInspector.SecurityOriginManager.EventTypes.SecurityOriginRemoved, this._securityOriginRemoved, this);
         }
     },
 
     _addOrigin: function(securityOrigin)
     {
         this._loadCacheNames(securityOrigin);
     },
 
     /**
      * @param {string} securityOrigin
@@ skipping 174 matching lines @@
     toString: function()
     {
         return this.securityOrigin + this.cacheName;
     }
 }
 
 
 WebInspector.ServiceWorkerCacheModel._symbol = Symbol("CacheStorageModel");
 /**
  * @param {!WebInspector.Target} target
- * @return {!WebInspector.ServiceWorkerCacheModel}
+ * @return {?WebInspector.ServiceWorkerCacheModel}
  */
 WebInspector.ServiceWorkerCacheModel.fromTarget = function(target)
 {
-    if (!target[WebInspector.ServiceWorkerCacheModel._symbol])
-        target[WebInspector.ServiceWorkerCacheModel._symbol] = new WebInspector.ServiceWorkerCacheModel(target);
+    if (!target[WebInspector.ServiceWorkerCacheModel._symbol]) {

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

Use the target.model(...) method.

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

Done.

+        var securityOriginManager = WebInspector.SecurityOriginManager.fromTarget(target);
+        if (!securityOriginManager)

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

It is never null. Instead, check for browser capability.

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

Done.

+            return null;
+        target[WebInspector.ServiceWorkerCacheModel._symbol] = new WebInspector.ServiceWorkerCacheModel(target, securityOriginManager);
+    }
 
     return target[WebInspector.ServiceWorkerCacheModel._symbol];
 }