aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_traits/script_msg.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-04-30 13:33:23 -0400
committerGitHub <noreply@github.com>2018-04-30 13:33:23 -0400
commit847115ba0441b1b1a6ad98562b010f7e33b7b14d (patch)
treef0c52de1b51d15d1e51a6b5a842c86be664c88eb /components/script_traits/script_msg.rs
parent76a66ee998ca024ea4bb849d3a2497debce94c25 (diff)
parente7ef9cfb303598e582f0f589da855bdd33c1dd08 (diff)
downloadservo-847115ba0441b1b1a6ad98562b010f7e33b7b14d.tar.gz
servo-847115ba0441b1b1a6ad98562b010f7e33b7b14d.zip
Auto merge of #20671 - cbrewster:history_url, r=asajeffrey
Make session history aware of URLs <!-- Please describe your changes on the following line: --> --- <!-- 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 build-geckolib` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- 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/20671) <!-- Reviewable:end -->
Diffstat (limited to 'components/script_traits/script_msg.rs')
-rw-r--r--components/script_traits/script_msg.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs
index d263753c7de..efc368e0761 100644
--- a/components/script_traits/script_msg.rs
+++ b/components/script_traits/script_msg.rs
@@ -105,9 +105,9 @@ pub enum ScriptMsg {
/// HTMLIFrameElement Forward or Back traversal.
TraverseHistory(TraversalDirection),
/// Inform the constellation of a pushed history state.
- PushHistoryState(HistoryStateId),
+ PushHistoryState(HistoryStateId, ServoUrl),
/// Inform the constellation of a replaced history state.
- ReplaceHistoryState(HistoryStateId),
+ ReplaceHistoryState(HistoryStateId, ServoUrl),
/// Gets the length of the joint session history from the constellation.
JointSessionHistoryLength(IpcSender<u32>),
/// Favicon detected