Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10295 - asajeffrey:remove-constellation-misc-panic, r=nox

Browse source 
Miscellaneous fixes to harden the constellation.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10295)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-01 19:14:48 +05:30
commit 7f06b467a4
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/compositing/constellation.rs
View file

@ -457,6 +457,9 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
pipeline_id: PipelineId, pipeline_id: PipelineId,
unprivileged_pipeline_content: UnprivilegedPipelineContent) unprivileged_pipeline_content: UnprivilegedPipelineContent)
{ {
// Note that this function can panic, due to process creation,
// avoiding this panic would require a mechanism for dealing
// with low-resource scenarios.
let (server, token) = let (server, token) =
IpcOneShotServer::<IpcSender<UnprivilegedPipelineContent>>::new().unwrap(); IpcOneShotServer::<IpcSender<UnprivilegedPipelineContent>>::new().unwrap();
@ -724,7 +727,7 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
debug!("constellation got remove iframe message"); debug!("constellation got remove iframe message");
self.handle_remove_iframe_msg(pipeline_id); self.handle_remove_iframe_msg(pipeline_id);
if let Some(sender) = sender { if let Some(sender) = sender {
sender.send(()).unwrap(); sender.send(()).unwrap_or_else(|e| debug!("Error replying to remove iframe ({})", e));
} }
} }
Request::Script(FromScriptMsg::NewFavicon(url)) => { Request::Script(FromScriptMsg::NewFavicon(url)) => {
@ -1566,6 +1569,10 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
/// Since this function is only used in reftests, we do not harden it against panic. /// Since this function is only used in reftests, we do not harden it against panic.
fn handle_is_ready_to_save_image(&mut self, fn handle_is_ready_to_save_image(&mut self,
pipeline_states: HashMap<PipelineId, Epoch>) -> ReadyToSave { pipeline_states: HashMap<PipelineId, Epoch>) -> ReadyToSave {
// Note that this function can panic, due to ipc-channel creation failure.
// avoiding this panic would require a mechanism for dealing
// with low-resource scenarios.
//
// If there is no root frame yet, the initial page has // If there is no root frame yet, the initial page has
// not loaded, so there is nothing to save yet. // not loaded, so there is nothing to save yet.
if self.root_frame_id.is_none() { if self.root_frame_id.is_none() {
@ -1601,8 +1608,9 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
// but hasn't yet notified the document. // but hasn't yet notified the document.
let (sender, receiver) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let msg = LayoutControlMsg::GetWebFontLoadState(sender); let msg = LayoutControlMsg::GetWebFontLoadState(sender);
pipeline.layout_chan.0.send(msg).unwrap(); pipeline.layout_chan.0.send(msg)
if receiver.recv().unwrap() { .unwrap_or_else(|e| debug!("Get web font failed ({})", e));
if receiver.recv().unwrap_or(true) {
return ReadyToSave::WebFontNotLoaded; return ReadyToSave::WebFontNotLoaded;
} }
@ -1681,7 +1689,9 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
self.close_pipeline(*pipeline_id, exit_mode); self.close_pipeline(*pipeline_id, exit_mode);
} }
self.frames.remove(&frame_id).unwrap(); if let None = self.frames.remove(&frame_id) {
debug!("Closing frame {:?} twice.", frame_id);
}
if let Some((parent_pipeline_id, _)) = parent_info { if let Some((parent_pipeline_id, _)) = parent_info {
let parent_pipeline = match self.pipelines.get_mut(&parent_pipeline_id) { let parent_pipeline = match self.pipelines.get_mut(&parent_pipeline_id) {
@ -1713,7 +1723,10 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
self.close_frame(*child_frame, exit_mode); self.close_frame(*child_frame, exit_mode);
} }
let pipeline = self.pipelines.remove(&pipeline_id).unwrap(); let pipeline = match self.pipelines.remove(&pipeline_id) {
Some(pipeline) => pipeline,
None => return debug!("Closing pipeline {:?} twice.", pipeline_id),
};
// If a child pipeline, remove from subpage map // If a child pipeline, remove from subpage map
if let Some(info) = pipeline.parent_info { if let Some(info) = pipeline.parent_info {
@ -1791,6 +1804,9 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
// Send the current frame tree to compositor, and grant paint // Send the current frame tree to compositor, and grant paint
// permission to each pipeline in the current frame tree. // permission to each pipeline in the current frame tree.
fn send_frame_tree_and_grant_paint_permission(&mut self) { fn send_frame_tree_and_grant_paint_permission(&mut self) {
// Note that this function can panic, due to ipc-channel creation failure.
// avoiding this panic would require a mechanism for dealing
// with low-resource scenarios.
if let Some(root_frame_id) = self.root_frame_id { if let Some(root_frame_id) = self.root_frame_id {
if let Some(frame_tree) = self.frame_to_sendable(root_frame_id) { if let Some(frame_tree) = self.frame_to_sendable(root_frame_id) {