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

Side by Side Diff: Source/devtools/front_end/sdk/ResourceTreeModel.js

Issue 299393007: DevTools: Remove MainFrameCreatedOrNavigated event. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 this._securityOriginFrameCount = {}; 54 this._securityOriginFrameCount = {};
55 this._inspectedPageURL = ""; 55 this._inspectedPageURL = "";
56 } 56 }
57 57
58 WebInspector.ResourceTreeModel.EventTypes = { 58 WebInspector.ResourceTreeModel.EventTypes = {
59 FrameAdded: "FrameAdded", 59 FrameAdded: "FrameAdded",
60 FrameNavigated: "FrameNavigated", 60 FrameNavigated: "FrameNavigated",
61 FrameDetached: "FrameDetached", 61 FrameDetached: "FrameDetached",
62 FrameResized: "FrameResized", 62 FrameResized: "FrameResized",
63 MainFrameNavigated: "MainFrameNavigated", 63 MainFrameNavigated: "MainFrameNavigated",
64 MainFrameCreatedOrNavigated: "MainFrameCreatedOrNavigated",
65 ResourceAdded: "ResourceAdded", 64 ResourceAdded: "ResourceAdded",
66 WillLoadCachedResources: "WillLoadCachedResources", 65 WillLoadCachedResources: "WillLoadCachedResources",
67 CachedResourcesLoaded: "CachedResourcesLoaded", 66 CachedResourcesLoaded: "CachedResourcesLoaded",
68 DOMContentLoaded: "DOMContentLoaded", 67 DOMContentLoaded: "DOMContentLoaded",
69 Load: "Load", 68 Load: "Load",
70 WillReloadPage: "WillReloadPage", 69 WillReloadPage: "WillReloadPage",
71 InspectedURLChanged: "InspectedURLChanged", 70 InspectedURLChanged: "InspectedURLChanged",
72 SecurityOriginAdded: "SecurityOriginAdded", 71 SecurityOriginAdded: "SecurityOriginAdded",
73 SecurityOriginRemoved: "SecurityOriginRemoved", 72 SecurityOriginRemoved: "SecurityOriginRemoved",
74 ScreencastFrame: "ScreencastFrame", 73 ScreencastFrame: "ScreencastFrame",
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 * @param {boolean=} aboutToNavigate 134 * @param {boolean=} aboutToNavigate
136 */ 135 */
137 _addFrame: function(frame, aboutToNavigate) 136 _addFrame: function(frame, aboutToNavigate)
138 { 137 {
139 this._frames[frame.id] = frame; 138 this._frames[frame.id] = frame;
140 if (frame.isMainFrame()) 139 if (frame.isMainFrame())
141 this.mainFrame = frame; 140 this.mainFrame = frame;
142 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes. FrameAdded, frame); 141 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes. FrameAdded, frame);
143 if (!aboutToNavigate) 142 if (!aboutToNavigate)
144 this._addSecurityOrigin(frame.securityOrigin); 143 this._addSecurityOrigin(frame.securityOrigin);
145 if (frame.isMainFrame())
146 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy pes.MainFrameCreatedOrNavigated, frame);
147 }, 144 },
148 145
149 /** 146 /**
150 * @param {string} securityOrigin 147 * @param {string} securityOrigin
151 */ 148 */
152 _addSecurityOrigin: function(securityOrigin) 149 _addSecurityOrigin: function(securityOrigin)
153 { 150 {
154 if (!this._securityOriginFrameCount[securityOrigin]) { 151 if (!this._securityOriginFrameCount[securityOrigin]) {
155 this._securityOriginFrameCount[securityOrigin] = 1; 152 this._securityOriginFrameCount[securityOrigin] = 1;
156 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy pes.SecurityOriginAdded, securityOrigin); 153 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy pes.SecurityOriginAdded, securityOrigin);
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 console.assert(frame); 238 console.assert(frame);
242 } 239 }
243 this._removeSecurityOrigin(frame.securityOrigin); 240 this._removeSecurityOrigin(frame.securityOrigin);
244 frame._navigate(framePayload); 241 frame._navigate(framePayload);
245 var addedOrigin = frame.securityOrigin; 242 var addedOrigin = frame.securityOrigin;
246 243
247 if (frame.isMainFrame()) 244 if (frame.isMainFrame())
248 this._inspectedPageURL = frame.url; 245 this._inspectedPageURL = frame.url;
249 246
250 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes. FrameNavigated, frame); 247 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes. FrameNavigated, frame);
251 if (frame.isMainFrame()) { 248 if (frame.isMainFrame())
252 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy pes.MainFrameNavigated, frame); 249 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy pes.MainFrameNavigated, frame);
253 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy pes.MainFrameCreatedOrNavigated, frame);
254 }
255 if (addedOrigin) 250 if (addedOrigin)
256 this._addSecurityOrigin(addedOrigin); 251 this._addSecurityOrigin(addedOrigin);
257 252
258 // Fill frame with retained resources (the ones loaded using new loader) . 253 // Fill frame with retained resources (the ones loaded using new loader) .
259 var resources = frame.resources(); 254 var resources = frame.resources();
260 for (var i = 0; i < resources.length; ++i) 255 for (var i = 0; i < resources.length; ++i)
261 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy pes.ResourceAdded, resources[i]); 256 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy pes.ResourceAdded, resources[i]);
262 257
263 if (frame.isMainFrame()) 258 if (frame.isMainFrame())
264 this._dispatchInspectedURLChanged(); 259 this._dispatchInspectedURLChanged();
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 screencastVisibilityChanged: function(visible) 811 screencastVisibilityChanged: function(visible)
817 { 812 {
818 this._resourceTreeModel.dispatchEventToListeners(WebInspector.ResourceTr eeModel.EventTypes.ScreencastVisibilityChanged, {visible:visible}); 813 this._resourceTreeModel.dispatchEventToListeners(WebInspector.ResourceTr eeModel.EventTypes.ScreencastVisibilityChanged, {visible:visible});
819 } 814 }
820 } 815 }
821 816
822 /** 817 /**
823 * @type {!WebInspector.ResourceTreeModel} 818 * @type {!WebInspector.ResourceTreeModel}
824 */ 819 */
825 WebInspector.resourceTreeModel; 820 WebInspector.resourceTreeModel;
OLDNEW
« no previous file with comments | « Source/devtools/front_end/sdk/CSSStyleModel.js ('k') | Source/devtools/front_end/sdk/StylesSourceMapping.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698