| OLD | NEW |
| 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.
FrameWillNavigate, frame); | 282 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.
FrameWillNavigate, frame); |
| 283 | 283 |
| 284 this._removeSecurityOrigin(frame.securityOrigin); | 284 this._removeSecurityOrigin(frame.securityOrigin); |
| 285 frame._navigate(framePayload); | 285 frame._navigate(framePayload); |
| 286 var addedOrigin = frame.securityOrigin; | 286 var addedOrigin = frame.securityOrigin; |
| 287 | 287 |
| 288 if (frame.isMainFrame()) | 288 if (frame.isMainFrame()) |
| 289 this._inspectedPageURL = frame.url; | 289 this._inspectedPageURL = frame.url; |
| 290 | 290 |
| 291 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.
FrameNavigated, frame); | 291 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.
FrameNavigated, frame); |
| 292 if (frame.isMainFrame()) | 292 if (frame.isMainFrame()) { |
| 293 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy
pes.MainFrameNavigated, frame); | 293 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy
pes.MainFrameNavigated, frame); |
| 294 if (WebInspector.moduleSetting("preserveConsoleLog").get()) |
| 295 WebInspector.console.log(WebInspector.UIString("Navigated to %s"
, frame.url)); |
| 296 else |
| 297 this.target().consoleModel.clear(); |
| 298 } |
| 294 if (addedOrigin) | 299 if (addedOrigin) |
| 295 this._addSecurityOrigin(addedOrigin); | 300 this._addSecurityOrigin(addedOrigin); |
| 296 | 301 |
| 297 // Fill frame with retained resources (the ones loaded using new loader)
. | 302 // Fill frame with retained resources (the ones loaded using new loader)
. |
| 298 var resources = frame.resources(); | 303 var resources = frame.resources(); |
| 299 for (var i = 0; i < resources.length; ++i) | 304 for (var i = 0; i < resources.length; ++i) |
| 300 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy
pes.ResourceAdded, resources[i]); | 305 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy
pes.ResourceAdded, resources[i]); |
| 301 | 306 |
| 302 if (frame.isMainFrame()) | 307 if (frame.isMainFrame()) |
| 303 this._dispatchInspectedURLChanged(); | 308 this._dispatchInspectedURLChanged(); |
| (...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 971 }, | 976 }, |
| 972 | 977 |
| 973 /** | 978 /** |
| 974 * @override | 979 * @override |
| 975 */ | 980 */ |
| 976 interstitialHidden: function() | 981 interstitialHidden: function() |
| 977 { | 982 { |
| 978 // Frontend is not interested in interstitials. | 983 // Frontend is not interested in interstitials. |
| 979 } | 984 } |
| 980 } | 985 } |
| OLD | NEW |