aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_traits/script_msg.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-09-19 14:32:45 -0500
committerGitHub <noreply@github.com>2016-09-19 14:32:45 -0500
commit9876923b29ae7c4f2b763e368fc34fe8a051afc4 (patch)
tree6c7818483e8b876984e62305d3b04b34ca4b8345 /components/script_traits/script_msg.rs
parent0b0495cff4c0062f1def279c8079ca76c58aef23 (diff)
parente9b2f1b916754ac57ab06326f49b0f1de5e1e9c0 (diff)
downloadservo-9876923b29ae7c4f2b763e368fc34fe8a051afc4.tar.gz
servo-9876923b29ae7c4f2b763e368fc34fe8a051afc4.zip
Auto merge of #13167 - ConnorGBrewster:reload_replace_current, r=asajeffrey
Replace current session entry when reloading <!-- Please describe your changes on the following line: --> This PR adds a replacement option when navigating. It replaces the current session history entry after a new page has been loaded. This will prevent reloading from adding a new entry to the session history. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13123 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13167) <!-- Reviewable:end -->
Diffstat (limited to 'components/script_traits/script_msg.rs')
-rw-r--r--components/script_traits/script_msg.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs
index aaa22732937..c3c777bb9f7 100644
--- a/components/script_traits/script_msg.rs
+++ b/components/script_traits/script_msg.rs
@@ -83,8 +83,9 @@ pub enum ScriptMsg {
/// All pending loads are complete, and the `load` event for this pipeline
/// has been dispatched.
LoadComplete(PipelineId),
- /// A new load has been requested.
- LoadUrl(PipelineId, LoadData),
+ /// A new load has been requested, with an option to replace the current entry once loaded
+ /// instead of adding a new entry.
+ LoadUrl(PipelineId, LoadData, bool),
/// Dispatch a mozbrowser event to a given iframe,
/// or to the window if no subpage id is provided.
/// First PipelineId is for the parent, second PipelineId is for the actual pipeline.