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

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/resources/ResourcesSection.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 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 Resources.ResourcesSection = class { 5 Resources.ResourcesSection = class {
6 /** 6 /**
7 * @param {!Resources.ResourcesPanel} storagePanel 7 * @param {!Resources.ResourcesPanel} storagePanel
8 * @param {!UI.TreeElement} treeElement 8 * @param {!UI.TreeElement} treeElement
9 */ 9 */
10 constructor(storagePanel, treeElement) { 10 constructor(storagePanel, treeElement) {
11 this._panel = storagePanel; 11 this._panel = storagePanel;
12 this._treeElement = treeElement; 12 this._treeElement = treeElement;
13 /** @type {!Map<string, !Resources.FrameTreeElement>} */ 13 /** @type {!Map<string, !Resources.FrameTreeElement>} */
14 this._treeElementForFrameId = new Map(); 14 this._treeElementForFrameId = new Map();
15 15
16 function addListener(eventType, handler, target) { 16 function addListener(eventType, handler, target) {
17 SDK.targetManager.addModelListener(SDK.ResourceTreeModel, eventType, event => handler.call(target, event.data)); 17 SDK.targetManager.addModelListener(SDK.ResourceTreeModel, eventType, event => handler.call(target, event.data));
18 } 18 }
19 addListener(SDK.ResourceTreeModel.Events.FrameAdded, this._frameAdded, this) ; 19 addListener(SDK.ResourceTreeModel.Events.FrameAdded, this._frameAdded, this) ;
20 addListener(SDK.ResourceTreeModel.Events.FrameNavigated, this._frameNavigate d, this); 20 addListener(SDK.ResourceTreeModel.Events.FrameNavigated, this._frameNavigate d, this);
21 addListener(SDK.ResourceTreeModel.Events.FrameDetached, this._frameDetached, this); 21 addListener(SDK.ResourceTreeModel.Events.FrameDetached, this._frameDetached, this);
22 addListener(SDK.ResourceTreeModel.Events.ResourceAdded, this._resourceAdded, this); 22 addListener(SDK.ResourceTreeModel.Events.ResourceAdded, this._resourceAdded, this);
23 23
24 var mainTarget = SDK.targetManager.mainTarget(); 24 var mainTarget = SDK.targetManager.mainTarget();
25 var resourceTreeModel = mainTarget && mainTarget.hasDOMCapability() && SDK.R esourceTreeModel.fromTarget(mainTarget); 25 var resourceTreeModel = mainTarget && mainTarget.model(SDK.ResourceTreeModel );
26 var mainFrame = resourceTreeModel && resourceTreeModel.mainFrame; 26 var mainFrame = resourceTreeModel && resourceTreeModel.mainFrame;
27 if (mainFrame) 27 if (mainFrame)
28 this._populateFrame(mainFrame); 28 this._populateFrame(mainFrame);
29 } 29 }
30 30
31 /** 31 /**
32 * @param {!SDK.ResourceTreeFrame} frame 32 * @param {!SDK.ResourceTreeFrame} frame
33 * @returns {?SDK.ResourceTreeFrame} 33 * @returns {?SDK.ResourceTreeFrame}
34 */ 34 */
35 static _getParentFrame(frame) { 35 static _getParentFrame(frame) {
36 var parentFrame = frame.parentFrame; 36 var parentFrame = frame.parentFrame;
37 if (parentFrame) 37 if (parentFrame)
38 return parentFrame; 38 return parentFrame;
39 var parentTarget = frame.target().parentTarget(); 39 var parentTarget = frame.target().parentTarget();
40 if (!parentTarget) 40 if (!parentTarget)
41 return null; 41 return null;
42 console.assert(parentTarget.hasDOMCapability()); 42 return parentTarget.model(SDK.ResourceTreeModel).mainFrame;
43 return SDK.ResourceTreeModel.fromTarget(parentTarget).mainFrame;
44 } 43 }
45 44
46 /** 45 /**
47 * @param {!SDK.ResourceTreeFrame} frame 46 * @param {!SDK.ResourceTreeFrame} frame
48 */ 47 */
49 _frameAdded(frame) { 48 _frameAdded(frame) {
50 var parentFrame = Resources.ResourcesSection._getParentFrame(frame); 49 var parentFrame = Resources.ResourcesSection._getParentFrame(frame);
51 var parentTreeElement = parentFrame ? this._treeElementForFrameId.get(parent Frame.id) : this._treeElement; 50 var parentTreeElement = parentFrame ? this._treeElementForFrameId.get(parent Frame.id) : this._treeElement;
52 if (!parentTreeElement) { 51 if (!parentTreeElement) {
53 console.warn(`No frame to route ${frame.url} to.`); 52 console.warn(`No frame to route ${frame.url} to.`);
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 this._panel.showCategoryView(this.titleAsText()); 157 this._panel.showCategoryView(this.titleAsText());
159 158
160 this.listItemElement.classList.remove('hovered'); 159 this.listItemElement.classList.remove('hovered');
161 SDK.DOMModel.hideDOMNodeHighlight(); 160 SDK.DOMModel.hideDOMNodeHighlight();
162 return false; 161 return false;
163 } 162 }
164 163
165 set hovered(hovered) { 164 set hovered(hovered) {
166 if (hovered) { 165 if (hovered) {
167 this.listItemElement.classList.add('hovered'); 166 this.listItemElement.classList.add('hovered');
168 var domModel = SDK.DOMModel.fromTarget(this._frame.target()); 167 var domModel = this._frame.target().model(SDK.DOMModel);
169 if (domModel) 168 if (domModel)
170 domModel.highlightFrame(this._frameId); 169 domModel.highlightFrame(this._frameId);
171 } else { 170 } else {
172 this.listItemElement.classList.remove('hovered'); 171 this.listItemElement.classList.remove('hovered');
173 SDK.DOMModel.hideDOMNodeHighlight(); 172 SDK.DOMModel.hideDOMNodeHighlight();
174 } 173 }
175 } 174 }
176 175
177 /** 176 /**
178 * @param {!SDK.Resource} resource 177 * @param {!SDK.Resource} resource
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 _sourceView() { 346 _sourceView() {
348 if (!this._sourceFrame) { 347 if (!this._sourceFrame) {
349 this._sourceFrame = new SourceFrame.ResourceSourceFrame(this._resource); 348 this._sourceFrame = new SourceFrame.ResourceSourceFrame(this._resource);
350 this._sourceFrame.setHighlighterType(this._resource.canonicalMimeType()); 349 this._sourceFrame.setHighlighterType(this._resource.canonicalMimeType());
351 } 350 }
352 return this._sourceFrame; 351 return this._sourceFrame;
353 } 352 }
354 }; 353 };
355 354
356 Resources.FrameResourceTreeElement._symbol = Symbol('treeElement'); 355 Resources.FrameResourceTreeElement._symbol = Symbol('treeElement');
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698