Notify embedder when history changes #15794
+111
−77
Notify embedder when history changes
- Loading branch information
commit e49354813597616db0473c88c94a715705e5aaff
| @@ -1351,7 +1351,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> | ||
| load_data: load_data, | ||
| replace_instant: None, | ||
| }); | ||
| self.compositor_proxy.send(ToCompositorMsg::ChangePageUrl(root_pipeline_id, url)); | ||
| } | ||
|
|
||
| fn handle_frame_size_msg(&mut self, | ||
| @@ -1664,11 +1663,8 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> | ||
| } | ||
| } | ||
|
|
||
| fn handle_load_start_msg(&mut self, pipeline_id: PipelineId) { | ||
| let frame_id = self.get_top_level_frame_for_pipeline(pipeline_id); | ||
| let forward = !self.joint_session_future_is_empty(frame_id); | ||
| let back = !self.joint_session_past_is_empty(frame_id); | ||
| self.compositor_proxy.send(ToCompositorMsg::LoadStart(back, forward)); | ||
| fn handle_load_start_msg(&mut self, _pipeline_id: PipelineId) { | ||
| self.compositor_proxy.send(ToCompositorMsg::LoadStart); | ||
| } | ||
|
|
||
| fn handle_load_complete_msg(&mut self, pipeline_id: PipelineId) { | ||
| @@ -1683,11 +1679,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> | ||
| if webdriver_reset { | ||
| self.webdriver.load_channel = None; | ||
| } | ||
| let frame_id = self.get_top_level_frame_for_pipeline(pipeline_id); | ||
| let forward = !self.joint_session_future_is_empty(frame_id); | ||
| let back = !self.joint_session_past_is_empty(frame_id); | ||
| let root = self.root_frame_id == frame_id; | ||
| self.compositor_proxy.send(ToCompositorMsg::LoadComplete(back, forward, root)); | ||
| self.compositor_proxy.send(ToCompositorMsg::LoadComplete); | ||
| self.handle_subframe_loaded(pipeline_id); | ||
| } | ||
|
|
||
| @@ -2102,6 +2094,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> | ||
| // Deactivate the old pipeline, and activate the new one. | ||
| self.update_activity(old_pipeline_id); | ||
| self.update_activity(pipeline_id); | ||
| self.notify_history_changed(pipeline_id); | ||
|
|
||
| // Set paint permissions correctly for the compositor layers. | ||
| self.send_frame_tree(); | ||
| @@ -2124,6 +2117,64 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> | ||
| } | ||
| } | ||
|
|
||
| fn notify_history_changed(&self, pipeline_id: PipelineId) { | ||
| // Send a flat projection of the history. | ||
| // The final vector is a concatenation of the LoadData of the past entries, | ||
| // the current entry and the future entries. | ||
| // LoadData of inner frames are ignored and replaced with the LoadData of the parent. | ||
|
|
||
| let top_level_frame_id = self.get_top_level_frame_for_pipeline(pipeline_id); | ||
|
|
||
| // Ignore LoadData of non-top-level frames. | ||
| let keep_load_data_if_top_frame = |state: &FrameState| { | ||
| match state.pipeline_id { | ||
| None => Some(state.load_data.clone()), | ||
| Some(pipeline_id) => { | ||
| match self.pipelines.get(&pipeline_id) { | ||
| None => Some(state.load_data.clone()), | ||
| Some(pipeline) => match pipeline.parent_info { | ||
| None => Some(state.load_data.clone()), | ||
| Some(_) => None, | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| // If LoadData was ignored, use the LoadData of the previous FrameState, which | ||
| // is the LoadData of the parent frame. | ||
| let resolve_load_data = |previous_load_data: &mut LoadData, load_data| { | ||
| let load_data = match load_data { | ||
| None => previous_load_data.clone(), | ||
| Some(load_data) => load_data, | ||
| }; | ||
| *previous_load_data = load_data.clone(); | ||
| Some(load_data) | ||
| }; | ||
|
|
||
| let current_load_data = match self.frames.get(&top_level_frame_id) { | ||
| Some(frame) => frame.load_data.clone(), | ||
| None => return warn!("notify_history_changed error after top-level frame closed."), | ||
| }; | ||
|
|
||
| let mut entries: Vec<LoadData> = self.joint_session_past(top_level_frame_id) | ||
| .map(&keep_load_data_if_top_frame) | ||
|
||
| .scan(current_load_data.clone(), &resolve_load_data) | ||
| .collect(); | ||
|
|
||
| entries.reverse(); | ||
|
|
||
| let current_index = entries.len(); | ||
|
|
||
| entries.push(current_load_data.clone()); | ||
|
|
||
| entries.extend(self.joint_session_future(top_level_frame_id) | ||
| .map(&keep_load_data_if_top_frame) | ||
| .scan(current_load_data.clone(), &resolve_load_data)); | ||
|
|
||
| self.compositor_proxy.send(ToCompositorMsg::HistoryChanged(entries, current_index)); | ||
| } | ||
|
|
||
| fn get_top_level_frame_for_pipeline(&self, mut pipeline_id: PipelineId) -> FrameId { | ||
| if PREFS.is_mozbrowser_enabled() { | ||
| loop { | ||
| @@ -2197,6 +2248,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> | ||
| if new_frame { | ||
| self.new_frame(frame_change.frame_id, frame_change.new_pipeline_id, frame_change.load_data); | ||
| self.update_activity(frame_change.new_pipeline_id); | ||
| self.notify_history_changed(frame_change.new_pipeline_id); | ||
| }; | ||
|
|
||
| if let Some(old_pipeline_id) = navigated { | ||
| @@ -2206,6 +2258,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> | ||
| // Clear the joint session future | ||
| let top_level_frame_id = self.get_top_level_frame_for_pipeline(frame_change.new_pipeline_id); | ||
| self.clear_joint_session_future(top_level_frame_id); | ||
| self.notify_history_changed(frame_change.new_pipeline_id); | ||
| } | ||
|
|
||
| if location_changed { | ||
Oops, something went wrong.
ProTip!
Use n and p to navigate between commits in a pull request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Do we need this
&? It makes the function call a dynamic rather than static dispatch.