third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js - Issue 2122353002: [DevTools] Make resource tree model optional

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/ServiceWorkersView.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

« third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js ('K') | « third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.js ('k') | third_party/WebKit/Source/devtools/front_end/screencast/ScreencastView.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 74c4c81cb0a376027199fd532f67d6ee649b4668..074adac819fd09c5bb58381dde5f1ddbc9e601f1 100644

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

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

@@ -53,8 +53,11 @@ WebInspector.ServiceWorkersView.prototype = {

this._manager.addEventListener(WebInspector.ServiceWorkerManager.Events.RegistrationUpdated, this._registrationUpdated, this);

this._manager.addEventListener(WebInspector.ServiceWorkerManager.Events.RegistrationDeleted, this._registrationDeleted, this);

this._manager.addEventListener(WebInspector.ServiceWorkerManager.Events.RegistrationErrorAdded, this._registrationErrorAdded, this);

- this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginAdded, this._updateSectionVisibility, this);

- this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginRemoved, this._updateSectionVisibility, this);

+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this._target);

+ if (resourceTreeModel) {

+ resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginAdded, this._updateSectionVisibility, this);

+ resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginRemoved, this._updateSectionVisibility, this);

+ }

/**

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

_updateSectionVisibility: function()

{

- var securityOrigins = new Set(this._target.resourceTreeModel.securityOrigins());

+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this._target);

+ var securityOrigins = new Set(resourceTreeModel ? resourceTreeModel.securityOrigins() : []);

for (var section of this._sections.values()) {

var visible = this._showAllCheckbox.checked() || securityOrigins.has(section._registration.securityOrigin);

section._section.element.classList.toggle("hidden", !visible);