Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01: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

4
components/script/dom/browsingcontext.rs
View file

@ -102,6 +102,7 @@ impl BrowsingContext {
history.drain((self.active_index.get() + 1)..); history.drain((self.active_index.get() + 1)..);
history.push(SessionHistoryEntry::new(document, document.url().clone(), document.Title())); history.push(SessionHistoryEntry::new(document, document.url().clone(), document.Title()));
self.active_index.set(self.active_index.get() + 1); self.active_index.set(self.active_index.get() + 1);
assert_eq!(self.active_index.get(), history.len() - 1);
} }
pub fn active_document(&self) -> Root<Document> { pub fn active_document(&self) -> Root<Document> {
@ -202,8 +203,7 @@ impl Iterator for ContextIterator {
if let Some(ref context) = popped { if let Some(ref context) = popped {
self.stack.extend(context.children.borrow() self.stack.extend(context.children.borrow()
.iter() .iter()
.cloned() .map(|c| Root::from_ref(&**c)));
.map(|ref c| Root::from_ref(&**c)));
} }
popped popped
} }

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