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

Use Cell instead of RefCell for Page.fragment_node.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-05-30 02:47:47 +09:00
parent b4463c1fb2
commit a1bf49c1ce
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/script/script_task.rs
View file

@ -162,7 +162,7 @@ pub struct Page {
resize_event: Untraceable<Cell<Option<Size2D<uint>>>>, resize_event: Untraceable<Cell<Option<Size2D<uint>>>>,
/// Pending scroll to fragment event, if any /// Pending scroll to fragment event, if any
fragment_node: Traceable<RefCell<Option<JS<Element>>>>, fragment_node: Cell<Option<JS<Element>>>,
/// Associated resource task for use by DOM objects like XMLHttpRequest /// Associated resource task for use by DOM objects like XMLHttpRequest
pub resource_task: Untraceable<ResourceTask>, pub resource_task: Untraceable<ResourceTask>,
@ -221,7 +221,7 @@ impl Page {
url: Untraceable::new(RefCell::new(None)), url: Untraceable::new(RefCell::new(None)),
next_subpage_id: Untraceable::new(Cell::new(SubpageId(0))), next_subpage_id: Untraceable::new(Cell::new(SubpageId(0))),
resize_event: Untraceable::new(Cell::new(None)), resize_event: Untraceable::new(Cell::new(None)),
fragment_node: Traceable::new(RefCell::new(None)), fragment_node: Cell::new(None),
last_reflow_id: Traceable::new(Cell::new(0)), last_reflow_id: Traceable::new(Cell::new(0)),
resource_task: Untraceable::new(resource_task), resource_task: Untraceable::new(resource_task),
constellation_chan: Untraceable::new(constellation_chan), constellation_chan: Untraceable::new(constellation_chan),
@ -1043,8 +1043,8 @@ impl ScriptTask {
let _ = wintarget.dispatch_event_with_target(Some((*doctarget).clone()), let _ = wintarget.dispatch_event_with_target(Some((*doctarget).clone()),
&mut *event); &mut *event);
let mut fragment_node = page.fragment_node.deref().borrow_mut(); let mut fragment_node = page.fragment_node.get();
(*fragment_node).assign(fragment.map_or(None, |fragid| page.find_fragment_node(fragid))); fragment_node.assign(fragment.map_or(None, |fragid| page.find_fragment_node(fragid)));
let ConstellationChan(ref chan) = self.constellation_chan; let ConstellationChan(ref chan) = self.constellation_chan;
chan.send(LoadCompleteMsg(page.id, url)); chan.send(LoadCompleteMsg(page.id, url));
@ -1080,7 +1080,7 @@ impl ScriptTask {
page.reflow(ReflowForDisplay, self.chan.clone(), self.compositor) page.reflow(ReflowForDisplay, self.chan.clone(), self.compositor)
} }
let mut fragment_node = page.fragment_node.deref().borrow_mut(); let mut fragment_node = page.fragment_node.get();
match fragment_node.take().map(|node| node.root()) { match fragment_node.take().map(|node| node.root()) {
Some(node) => self.scroll_fragment_point(pipeline_id, &*node), Some(node) => self.scroll_fragment_point(pipeline_id, &*node),
None => {} None => {}