Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Addressed comment

Browse source
This commit is contained in:
Connor Brewster 2016-05-11 15:01:43 -06:00
parent 9efd214b1e
commit e50eb2a4d6
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/script_thread.rs
View file

@ -625,17 +625,15 @@ impl ScriptThread {
// Gather them first to avoid a double mut borrow on self.
let mut resizes = vec!();
{
let context = self.browsing_context.get();
if let Some(context) = context {
for context in context.iter() {
// Only process a resize if layout is idle.
let window = context.active_window();
let resize_event = window.steal_resize_event();
match resize_event {
Some(size) => resizes.push((window.pipeline(), size)),
None => ()
}
let context = self.browsing_context.get();
if let Some(context) = context {
for context in context.iter() {
// Only process a resize if layout is idle.
let window = context.active_window();
let resize_event = window.steal_resize_event();
match resize_event {
Some(size) => resizes.push((window.pipeline(), size)),
None => ()
}
}
}
@ -1396,7 +1394,7 @@ impl ScriptThread {
let ConstellationChan(ref chan) = self.constellation_chan;
chan.send(ConstellationMsg::SetFinalUrl(incomplete.pipeline_id, final_url.clone())).unwrap();
}
debug!("ScriptThread: loading {} on context {:?}", incomplete.url, incomplete.pipeline_id);
debug!("ScriptThread: loading {} on pipeline {:?}", incomplete.url, incomplete.pipeline_id);
let frame_element = incomplete.parent_info.and_then(|(parent_id, subpage_id)| {
// The root context may not exist yet, if the parent of this frame