Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Unified Diff: third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js

Issue 2122353002: [DevTools] Make resource tree model optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js b/third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js
index ea87c7b0c54b77da56714d4fdbc01b548a5f8714..d8fe93fe85a39523a3e493ebd4c4972354106e72 100644
--- a/third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js
@@ -132,14 +132,17 @@ WebInspector.DOMStorageModel.prototype = {
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);
+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this.target());
+ if (resourceTreeModel) {
+ resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginAdded, this._securityOriginAdded, this);
+ resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginRemoved, this._securityOriginRemoved, this);
+
+ var securityOrigins = resourceTreeModel.securityOrigins();
dgozman 2016/07/14 16:29:28 Looks like this model doesn't function without sec
eostroukhov-old 2016/07/20 23:46:15 Done.
+ for (var i = 0; i < securityOrigins.length; ++i)
+ this._addOrigin(securityOrigins[i]);
+ }
this._agent.enable();
- var securityOrigins = this.target().resourceTreeModel.securityOrigins();
- for (var i = 0; i < securityOrigins.length; ++i)
- this._addOrigin(securityOrigins[i]);
-
this._enabled = true;
},

Powered by Google App Engine
This is Rietveld 408576698