third_party/WebKit/Source/devtools/front_end/resources/ClearStorageView.js - Issue 2172753002: [DevTools] No longer store security origins in ResourceTreeModel

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2172753002: [DevTools] No longer store security origins in ResourceTreeModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Extracted security origins from the ResourceTreeModel 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

« third_party/WebKit/Source/devtools/front_end/resources/AppManifestView.js ('K') | « third_party/WebKit/Source/devtools/front_end/resources/AppManifestView.js ('k') | third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js » ('j') | third_party/WebKit/Source/devtools/front_end/resources/IndexedDBModel.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/Source/devtools/front_end/resources/ClearStorageView.js b/third_party/WebKit/Source/devtools/front_end/resources/ClearStorageView.js

index e038177e518b3a1453e0ad953d7f13d1b387123a..4aea0492782e4def971e03e8038dd8ecd9bd7e9b 100644

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

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

@@ -70,7 +70,8 @@ WebInspector.ClearStorageView.prototype = {

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.mainSecurityOr

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.

@@ -131,11 +132,9 @@ WebInspector.ClearStorageView.prototype = {

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) {