| 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 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 | 437 |
| 438 resumeReload: function() | 438 resumeReload: function() |
| 439 { | 439 { |
| 440 this._reloadSuspensionCount--; | 440 this._reloadSuspensionCount--; |
| 441 console.assert(this._reloadSuspensionCount >= 0, "Unbalanced call to Res
ourceTreeModel.resumeReload()"); | 441 console.assert(this._reloadSuspensionCount >= 0, "Unbalanced call to Res
ourceTreeModel.resumeReload()"); |
| 442 if (!this._reloadSuspensionCount && this._pendingReloadOptions) | 442 if (!this._reloadSuspensionCount && this._pendingReloadOptions) |
| 443 this.reloadPage.apply(this, this._pendingReloadOptions); | 443 this.reloadPage.apply(this, this._pendingReloadOptions); |
| 444 }, | 444 }, |
| 445 | 445 |
| 446 /** | 446 /** |
| 447 * @param {boolean=} ignoreCache | 447 * @param {boolean=} bypassCache |
| 448 * @param {string=} scriptToEvaluateOnLoad | 448 * @param {string=} scriptToEvaluateOnLoad |
| 449 */ | 449 */ |
| 450 reloadPage: function(ignoreCache, scriptToEvaluateOnLoad) | 450 reloadPage: function(bypassCache, scriptToEvaluateOnLoad) |
| 451 { | 451 { |
| 452 // Only dispatch PageReloadRequested upon first reload request to simpli
fy client logic. | 452 // Only dispatch PageReloadRequested upon first reload request to simpli
fy client logic. |
| 453 if (!this._pendingReloadOptions) | 453 if (!this._pendingReloadOptions) |
| 454 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy
pes.PageReloadRequested); | 454 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTy
pes.PageReloadRequested); |
| 455 if (this._reloadSuspensionCount) { | 455 if (this._reloadSuspensionCount) { |
| 456 this._pendingReloadOptions = [ignoreCache, scriptToEvaluateOnLoad]; | 456 this._pendingReloadOptions = [bypassCache, scriptToEvaluateOnLoad]; |
| 457 return; | 457 return; |
| 458 } | 458 } |
| 459 this._pendingReloadOptions = null; | 459 this._pendingReloadOptions = null; |
| 460 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.
WillReloadPage); | 460 this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.
WillReloadPage); |
| 461 this._agent.reload(ignoreCache, scriptToEvaluateOnLoad); | 461 this._agent.reload(bypassCache, scriptToEvaluateOnLoad); |
| 462 }, | 462 }, |
| 463 | 463 |
| 464 __proto__: WebInspector.SDKModel.prototype | 464 __proto__: WebInspector.SDKModel.prototype |
| 465 } | 465 } |
| 466 | 466 |
| 467 /** | 467 /** |
| 468 * @constructor | 468 * @constructor |
| 469 * @param {!WebInspector.ResourceTreeModel} model | 469 * @param {!WebInspector.ResourceTreeModel} model |
| 470 * @param {?WebInspector.ResourceTreeFrame} parentFrame | 470 * @param {?WebInspector.ResourceTreeFrame} parentFrame |
| 471 * @param {!PageAgent.FrameId} frameId | 471 * @param {!PageAgent.FrameId} frameId |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 900 }, | 900 }, |
| 901 | 901 |
| 902 /** | 902 /** |
| 903 * @override | 903 * @override |
| 904 */ | 904 */ |
| 905 interstitialHidden: function() | 905 interstitialHidden: function() |
| 906 { | 906 { |
| 907 // Frontend is not interested in interstitials. | 907 // Frontend is not interested in interstitials. |
| 908 } | 908 } |
| 909 } | 909 } |
| OLD | NEW |