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

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/resources/ApplicationPanelSidebar.js

Issue 2782773002: [DevTools] Remove SDKModels' fromTarget methods (Closed)
Patch Set: addressed review comments Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Joseph Pecoraro 3 * Copyright (C) 2009 Joseph Pecoraro
4 * Copyright (C) 2013 Samsung Electronics. All rights reserved. 4 * Copyright (C) 2013 Samsung Electronics. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 125 }
126 126
127 /** 127 /**
128 * @override 128 * @override
129 * @param {!SDK.Target} target 129 * @param {!SDK.Target} target
130 */ 130 */
131 targetAdded(target) { 131 targetAdded(target) {
132 if (this._target) 132 if (this._target)
133 return; 133 return;
134 this._target = target; 134 this._target = target;
135 this._databaseModel = Resources.DatabaseModel.fromTarget(target); 135 this._databaseModel = target.model(Resources.DatabaseModel);
136
137 this._databaseModel.addEventListener(Resources.DatabaseModel.Events.Database Added, this._databaseAdded, this); 136 this._databaseModel.addEventListener(Resources.DatabaseModel.Events.Database Added, this._databaseAdded, this);
138 this._databaseModel.addEventListener(Resources.DatabaseModel.Events.Database sRemoved, this._resetWebSQL, this); 137 this._databaseModel.addEventListener(Resources.DatabaseModel.Events.Database sRemoved, this._resetWebSQL, this);
139 138
140 var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target); 139 var resourceTreeModel = target.model(SDK.ResourceTreeModel);
141 if (!resourceTreeModel) 140 if (!resourceTreeModel)
142 return; 141 return;
143 142
144 if (resourceTreeModel.cachedResourcesLoaded()) 143 if (resourceTreeModel.cachedResourcesLoaded())
145 this._initialize(); 144 this._initialize();
146 145
147 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.CachedResour cesLoaded, this._initialize, this); 146 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.CachedResour cesLoaded, this._initialize, this);
148 resourceTreeModel.addEventListener( 147 resourceTreeModel.addEventListener(
149 SDK.ResourceTreeModel.Events.WillLoadCachedResources, this._resetWithFra mes, this); 148 SDK.ResourceTreeModel.Events.WillLoadCachedResources, this._resetWithFra mes, this);
150 } 149 }
151 150
152 /** 151 /**
153 * @override 152 * @override
154 * @param {!SDK.Target} target 153 * @param {!SDK.Target} target
155 */ 154 */
156 targetRemoved(target) { 155 targetRemoved(target) {
157 if (target !== this._target) 156 if (target !== this._target)
158 return; 157 return;
159 delete this._target; 158 delete this._target;
160 159
161 var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target); 160 var resourceTreeModel = target.model(SDK.ResourceTreeModel);
162 if (resourceTreeModel) { 161 if (resourceTreeModel) {
163 resourceTreeModel.removeEventListener(SDK.ResourceTreeModel.Events.CachedR esourcesLoaded, this._initialize, this); 162 resourceTreeModel.removeEventListener(SDK.ResourceTreeModel.Events.CachedR esourcesLoaded, this._initialize, this);
164 resourceTreeModel.removeEventListener( 163 resourceTreeModel.removeEventListener(
165 SDK.ResourceTreeModel.Events.WillLoadCachedResources, this._resetWithF rames, this); 164 SDK.ResourceTreeModel.Events.WillLoadCachedResources, this._resetWithF rames, this);
166 } 165 }
167 this._databaseModel.removeEventListener(Resources.DatabaseModel.Events.Datab aseAdded, this._databaseAdded, this); 166 this._databaseModel.removeEventListener(Resources.DatabaseModel.Events.Datab aseAdded, this._databaseAdded, this);
168 this._databaseModel.removeEventListener(Resources.DatabaseModel.Events.Datab asesRemoved, this._resetWebSQL, this); 167 this._databaseModel.removeEventListener(Resources.DatabaseModel.Events.Datab asesRemoved, this._resetWebSQL, this);
169 168
170 this._resetWithFrames(); 169 this._resetWithFrames();
171 } 170 }
172 171
173 /** 172 /**
174 * @override 173 * @override
175 */ 174 */
176 focus() { 175 focus() {
177 this._sidebarTree.focus(); 176 this._sidebarTree.focus();
178 } 177 }
179 178
180 _initialize() { 179 _initialize() {
181 for (var frame of SDK.ResourceTreeModel.frames()) 180 for (var frame of SDK.ResourceTreeModel.frames())
182 this._addCookieDocument(frame); 181 this._addCookieDocument(frame);
183 this._databaseModel.enable(); 182 this._databaseModel.enable();
184 183
185 var indexedDBModel = Resources.IndexedDBModel.fromTarget(this._target); 184 var indexedDBModel = this._target.model(Resources.IndexedDBModel);
186 if (indexedDBModel) 185 if (indexedDBModel)
187 indexedDBModel.enable(); 186 indexedDBModel.enable();
188 187
189 var cacheStorageModel = SDK.ServiceWorkerCacheModel.fromTarget(this._target) ; 188 var cacheStorageModel = this._target.model(SDK.ServiceWorkerCacheModel);
190 if (cacheStorageModel) 189 if (cacheStorageModel)
191 cacheStorageModel.enable(); 190 cacheStorageModel.enable();
192 var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(this._target); 191 var resourceTreeModel = this._target.model(SDK.ResourceTreeModel);
193 if (resourceTreeModel) 192 if (resourceTreeModel)
194 this._populateApplicationCacheTree(resourceTreeModel); 193 this._populateApplicationCacheTree(resourceTreeModel);
195 var domStorageModel = Resources.DOMStorageModel.fromTarget(this._target); 194 var domStorageModel = this._target.model(Resources.DOMStorageModel);
196 if (domStorageModel) 195 if (domStorageModel)
197 this._populateDOMStorageTree(domStorageModel); 196 this._populateDOMStorageTree(domStorageModel);
198 this.indexedDBListTreeElement._initialize(); 197 this.indexedDBListTreeElement._initialize();
199 var serviceWorkerCacheModel = SDK.ServiceWorkerCacheModel.fromTarget(this._t arget); 198 var serviceWorkerCacheModel = this._target.model(SDK.ServiceWorkerCacheModel );
200 this.cacheStorageListTreeElement._initialize(serviceWorkerCacheModel); 199 this.cacheStorageListTreeElement._initialize(serviceWorkerCacheModel);
201 this._initDefaultSelection(); 200 this._initDefaultSelection();
202 } 201 }
203 202
204 _initDefaultSelection() { 203 _initDefaultSelection() {
205 var itemURL = this._panel.lastSelectedItemURL(); 204 var itemURL = this._panel.lastSelectedItemURL();
206 if (itemURL) { 205 if (itemURL) {
207 var rootElement = this._sidebarTree.rootElement(); 206 var rootElement = this._sidebarTree.rootElement();
208 for (var treeElement = rootElement.firstChild(); treeElement; 207 for (var treeElement = rootElement.firstChild(); treeElement;
209 treeElement = treeElement.traverseNextTreeElement(false, rootElement, true)) { 208 treeElement = treeElement.traverseNextTreeElement(false, rootElement, true)) {
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 domStorageModel.enable(); 484 domStorageModel.enable();
486 domStorageModel.storages().forEach(this._addDOMStorage.bind(this)); 485 domStorageModel.storages().forEach(this._addDOMStorage.bind(this));
487 domStorageModel.addEventListener(Resources.DOMStorageModel.Events.DOMStorage Added, this._domStorageAdded, this); 486 domStorageModel.addEventListener(Resources.DOMStorageModel.Events.DOMStorage Added, this._domStorageAdded, this);
488 domStorageModel.addEventListener(Resources.DOMStorageModel.Events.DOMStorage Removed, this._domStorageRemoved, this); 487 domStorageModel.addEventListener(Resources.DOMStorageModel.Events.DOMStorage Removed, this._domStorageRemoved, this);
489 } 488 }
490 489
491 /** 490 /**
492 * @param {!SDK.ResourceTreeModel} resourceTreeModel 491 * @param {!SDK.ResourceTreeModel} resourceTreeModel
493 */ 492 */
494 _populateApplicationCacheTree(resourceTreeModel) { 493 _populateApplicationCacheTree(resourceTreeModel) {
495 this._applicationCacheModel = Resources.ApplicationCacheModel.fromTarget(thi s._target); 494 this._applicationCacheModel = this._target.model(Resources.ApplicationCacheM odel);
496 495
497 this._applicationCacheViews = {}; 496 this._applicationCacheViews = {};
498 this._applicationCacheFrameElements = {}; 497 this._applicationCacheFrameElements = {};
499 this._applicationCacheManifestElements = {}; 498 this._applicationCacheManifestElements = {};
500 499
501 this._applicationCacheModel.addEventListener( 500 this._applicationCacheModel.addEventListener(
502 Resources.ApplicationCacheModel.Events.FrameManifestAdded, this._applica tionCacheFrameManifestAdded, this); 501 Resources.ApplicationCacheModel.Events.FrameManifestAdded, this._applica tionCacheFrameManifestAdded, this);
503 this._applicationCacheModel.addEventListener( 502 this._applicationCacheModel.addEventListener(
504 Resources.ApplicationCacheModel.Events.FrameManifestRemoved, this._appli cationCacheFrameManifestRemoved, this); 503 Resources.ApplicationCacheModel.Events.FrameManifestRemoved, this._appli cationCacheFrameManifestRemoved, this);
505 this._applicationCacheModel.addEventListener( 504 this._applicationCacheModel.addEventListener(
(...skipping 10 matching lines...) Expand all
516 var frameId = event.data; 515 var frameId = event.data;
517 var manifestURL = this._applicationCacheModel.frameManifestURL(frameId); 516 var manifestURL = this._applicationCacheModel.frameManifestURL(frameId);
518 517
519 var manifestTreeElement = this._applicationCacheManifestElements[manifestURL ]; 518 var manifestTreeElement = this._applicationCacheManifestElements[manifestURL ];
520 if (!manifestTreeElement) { 519 if (!manifestTreeElement) {
521 manifestTreeElement = new Resources.ApplicationCacheManifestTreeElement(th is._panel, manifestURL); 520 manifestTreeElement = new Resources.ApplicationCacheManifestTreeElement(th is._panel, manifestURL);
522 this.applicationCacheListTreeElement.appendChild(manifestTreeElement); 521 this.applicationCacheListTreeElement.appendChild(manifestTreeElement);
523 this._applicationCacheManifestElements[manifestURL] = manifestTreeElement; 522 this._applicationCacheManifestElements[manifestURL] = manifestTreeElement;
524 } 523 }
525 524
526 var model = SDK.ResourceTreeModel.fromTarget(this._target); 525 var model = this._target.model(SDK.ResourceTreeModel);
527 var frameTreeElement = new Resources.ApplicationCacheFrameTreeElement(this, model.frameForId(frameId), manifestURL); 526 var frameTreeElement = new Resources.ApplicationCacheFrameTreeElement(this, model.frameForId(frameId), manifestURL);
528 manifestTreeElement.appendChild(frameTreeElement); 527 manifestTreeElement.appendChild(frameTreeElement);
529 manifestTreeElement.expand(); 528 manifestTreeElement.expand();
530 this._applicationCacheFrameElements[frameId] = frameTreeElement; 529 this._applicationCacheFrameElements[frameId] = frameTreeElement;
531 } 530 }
532 531
533 _applicationCacheFrameManifestRemoved(event) { 532 _applicationCacheFrameManifestRemoved(event) {
534 var frameId = event.data; 533 var frameId = event.data;
535 var frameTreeElement = this._applicationCacheFrameElements[frameId]; 534 var frameTreeElement = this._applicationCacheFrameElements[frameId];
536 if (!frameTreeElement) 535 if (!frameTreeElement)
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 _initialize() { 1058 _initialize() {
1060 SDK.targetManager.addModelListener( 1059 SDK.targetManager.addModelListener(
1061 Resources.IndexedDBModel, Resources.IndexedDBModel.Events.DatabaseAdded, this._indexedDBAdded, this); 1060 Resources.IndexedDBModel, Resources.IndexedDBModel.Events.DatabaseAdded, this._indexedDBAdded, this);
1062 SDK.targetManager.addModelListener( 1061 SDK.targetManager.addModelListener(
1063 Resources.IndexedDBModel, Resources.IndexedDBModel.Events.DatabaseRemove d, this._indexedDBRemoved, this); 1062 Resources.IndexedDBModel, Resources.IndexedDBModel.Events.DatabaseRemove d, this._indexedDBRemoved, this);
1064 SDK.targetManager.addModelListener( 1063 SDK.targetManager.addModelListener(
1065 Resources.IndexedDBModel, Resources.IndexedDBModel.Events.DatabaseLoaded , this._indexedDBLoaded, this); 1064 Resources.IndexedDBModel, Resources.IndexedDBModel.Events.DatabaseLoaded , this._indexedDBLoaded, this);
1066 /** @type {!Array.<!Resources.IDBDatabaseTreeElement>} */ 1065 /** @type {!Array.<!Resources.IDBDatabaseTreeElement>} */
1067 this._idbDatabaseTreeElements = []; 1066 this._idbDatabaseTreeElements = [];
1068 1067
1069 var targets = SDK.targetManager.targets(SDK.Target.Capability.Browser); 1068 for (var indexedDBModel of SDK.targetManager.models(Resources.IndexedDBModel )) {
1070 for (var i = 0; i < targets.length; ++i) {
1071 var indexedDBModel = Resources.IndexedDBModel.fromTarget(targets[i]);
1072 var databases = indexedDBModel.databases(); 1069 var databases = indexedDBModel.databases();
1073 for (var j = 0; j < databases.length; ++j) 1070 for (var j = 0; j < databases.length; ++j)
1074 this._addIndexedDB(indexedDBModel, databases[j]); 1071 this._addIndexedDB(indexedDBModel, databases[j]);
1075 } 1072 }
1076 } 1073 }
1077 1074
1078 /** 1075 /**
1079 * @override 1076 * @override
1080 */ 1077 */
1081 onattach() { 1078 onattach() {
1082 super.onattach(); 1079 super.onattach();
1083 this.listItemElement.addEventListener('contextmenu', this._handleContextMenu Event.bind(this), true); 1080 this.listItemElement.addEventListener('contextmenu', this._handleContextMenu Event.bind(this), true);
1084 } 1081 }
1085 1082
1086 _handleContextMenuEvent(event) { 1083 _handleContextMenuEvent(event) {
1087 var contextMenu = new UI.ContextMenu(event); 1084 var contextMenu = new UI.ContextMenu(event);
1088 contextMenu.appendItem(Common.UIString('Refresh IndexedDB'), this.refreshInd exedDB.bind(this)); 1085 contextMenu.appendItem(Common.UIString('Refresh IndexedDB'), this.refreshInd exedDB.bind(this));
1089 contextMenu.show(); 1086 contextMenu.show();
1090 } 1087 }
1091 1088
1092 refreshIndexedDB() { 1089 refreshIndexedDB() {
1093 var targets = SDK.targetManager.targets(SDK.Target.Capability.Browser); 1090 for (var indexedDBModel of SDK.targetManager.models(Resources.IndexedDBModel ))
1094 for (var i = 0; i < targets.length; ++i) 1091 indexedDBModel.refreshDatabaseNames();
1095 Resources.IndexedDBModel.fromTarget(targets[i]).refreshDatabaseNames();
1096 } 1092 }
1097 1093
1098 /** 1094 /**
1099 * @param {!Common.Event} event 1095 * @param {!Common.Event} event
1100 */ 1096 */
1101 _indexedDBAdded(event) { 1097 _indexedDBAdded(event) {
1102 var databaseId = /** @type {!Resources.IndexedDBModel.DatabaseId} */ (event. data.databaseId); 1098 var databaseId = /** @type {!Resources.IndexedDBModel.DatabaseId} */ (event. data.databaseId);
1103 var model = /** @type {!Resources.IndexedDBModel} */ (event.data.model); 1099 var model = /** @type {!Resources.IndexedDBModel} */ (event.data.model);
1104 this._addIndexedDB(model, databaseId); 1100 this._addIndexedDB(model, databaseId);
1105 } 1101 }
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
1646 1642
1647 this.element.classList.add('storage-view'); 1643 this.element.classList.add('storage-view');
1648 this._emptyWidget = new UI.EmptyWidget(''); 1644 this._emptyWidget = new UI.EmptyWidget('');
1649 this._emptyWidget.show(this.element); 1645 this._emptyWidget.show(this.element);
1650 } 1646 }
1651 1647
1652 setText(text) { 1648 setText(text) {
1653 this._emptyWidget.text = text; 1649 this._emptyWidget.text = text;
1654 } 1650 }
1655 }; 1651 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698