Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-29 16:19:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Track hash changes in session history

Browse source 
Notify history changed on pushState and scroll to frag
This commit is contained in:
Connor Brewster 2018-06-12 22:12:17 +02:00
parent c1cc2aaf9c
commit 61442cce4b
22 changed files with 110 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/constellation/session_history.rs
View file

@ -70,7 +70,7 @@ impl JointSessionHistory {
SessionHistoryDiff::BrowsingContextDiff { browsing_context_id, .. } => {
*browsing_context_id != context_id
},
SessionHistoryDiff::PipelineDiff { .. } => true,
_ => true,
}
});
self.future.retain(|diff| {
@ -78,7 +78,7 @@ impl JointSessionHistory {
SessionHistoryDiff::BrowsingContextDiff { browsing_context_id, .. } => {
*browsing_context_id != context_id
},
SessionHistoryDiff::PipelineDiff { .. } => true,
_ => true,
}
});
}
@ -174,6 +174,11 @@ pub enum SessionHistoryDiff {
/// The new url
new_url: ServoUrl,
},
HashDiff {
pipeline_reloader: NeedsToReload,
old_url: ServoUrl,
new_url: ServoUrl,
},
}
impl SessionHistoryDiff {
@ -186,7 +191,7 @@ impl SessionHistoryDiff {
NeedsToReload::Yes(..) => None,
}
},
SessionHistoryDiff::PipelineDiff { .. } => None,
_ => None,
}
}
@ -199,7 +204,7 @@ impl SessionHistoryDiff {
NeedsToReload::Yes(..) => None,
}
},
SessionHistoryDiff::PipelineDiff { .. } => None,
_ => None,
}
}
@ -213,12 +218,17 @@ impl SessionHistoryDiff {
if *new_reloader == *replaced_reloader {
*new_reloader = reloader.clone();
}
}
},
SessionHistoryDiff::PipelineDiff { ref mut pipeline_reloader, .. } => {
if *pipeline_reloader == *replaced_reloader {
*pipeline_reloader = reloader.clone();
}
}
},
SessionHistoryDiff::HashDiff { ref mut pipeline_reloader, .. } => {
if *pipeline_reloader == *replaced_reloader {
*pipeline_reloader = reloader.clone();
}
},
}
}
}