Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-25 09:34:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #2135 : mbrubeck/servo/refcell-get, r=larsbergstrom

Browse source 
It's going away in the next Rust upgrade (mozilla/rust#13301). r? @larsbergstrom

We'll need to do the same in rust-layers.
This commit is contained in:
bors-servo 2014-04-16 19:58:07 -04:00
commit aafadb65f2
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/components/main/constellation.rs
View file

@ -124,7 +124,7 @@ impl FrameTreeTraversal for Rc<FrameTree> {
let mut child = children.mut_iter() let mut child = children.mut_iter()
.find(|child| child.frame_tree.pipeline.id == id); .find(|child| child.frame_tree.pipeline.id == id);
for child in child.mut_iter() { for child in child.mut_iter() {
new_child.parent.set(child.frame_tree.parent.get()); new_child.parent.set(child.frame_tree.parent.borrow().clone());
return ReplacedNode(replace(&mut child.frame_tree, new_child)); return ReplacedNode(replace(&mut child.frame_tree, new_child));
} }
} }
@ -549,7 +549,7 @@ impl Constellation {
source Id of LoadIframeUrlMsg does have an associated pipeline in source Id of LoadIframeUrlMsg does have an associated pipeline in
constellation. This should be impossible.").clone(); constellation. This should be impossible.").clone();
let source_url = source_pipeline.url.get().clone().expect("Constellation: LoadUrlIframeMsg's let source_url = source_pipeline.url.borrow().clone().expect("Constellation: LoadUrlIframeMsg's
source's Url is None. There should never be a LoadUrlIframeMsg from a pipeline source's Url is None. There should never be a LoadUrlIframeMsg from a pipeline
that was never given a url to load."); that was never given a url to load.");
@ -720,12 +720,9 @@ impl Constellation {
let to_add = frame_change.after.clone(); let to_add = frame_change.after.clone();
// Create the next frame tree that will be given to the compositor // Create the next frame tree that will be given to the compositor
let next_frame_tree = if to_add.parent.borrow().is_some() {
// NOTE: work around borrowchk issues // NOTE: work around borrowchk issues
let tmp = to_add.parent.clone(); self.current_frame().get_ref().clone()
let next_frame_tree = if tmp.get().is_some() {
// NOTE: work around borrowchk issues
let tmp = self.current_frame().get_ref();
tmp.clone()
} else { } else {
to_add.clone() to_add.clone()
}; };

2
src/components/main/pipeline.rs
View file

@ -202,7 +202,7 @@ impl Pipeline {
} }
pub fn reload(&self) { pub fn reload(&self) {
self.url.get().clone().map(|url| { self.url.borrow().clone().map(|url| {
self.load(url); self.load(url);
}); });
} }

4
src/components/script/html/hubbub_html_parser.rs
View file

@ -252,7 +252,7 @@ pub fn parse_html(page: &Page,
resource_task: ResourceTask) resource_task: ResourceTask)
-> HtmlParserResult { -> HtmlParserResult {
debug!("Hubbub: parsing {:?}", url); debug!("Hubbub: parsing {:?}", url);
let next_subpage_id: SubpageId = page.next_subpage_id.get(); let next_subpage_id: SubpageId = *page.next_subpage_id.borrow();
// Spawn a CSS parser to receive links to CSS style sheets. // Spawn a CSS parser to receive links to CSS style sheets.
let resource_task2 = resource_task.clone(); let resource_task2 = resource_task.clone();
@ -375,7 +375,7 @@ pub fn parse_html(page: &Page,
iframe_element.get_mut().set_frame(iframe_url.clone()); iframe_element.get_mut().set_frame(iframe_url.clone());
// Subpage Id // Subpage Id
let subpage_id = next_subpage_id.get(); let subpage_id = *next_subpage_id.borrow();
let SubpageId(id_num) = subpage_id; let SubpageId(id_num) = subpage_id;
next_subpage_id.set(SubpageId(id_num + 1)); next_subpage_id.set(SubpageId(id_num + 1));