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

auto merge of #2499 : mbrubeck/servo/unpub, r=metajack

Browse source
This commit is contained in:
bors-servo 2014-05-28 18:31:07 -04:00
commit 23a63ef4ae
1 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,7 @@ pub struct Page {
pub subpage_id: Option<SubpageId>, pub subpage_id: Option<SubpageId>,
/// Unique id for last reflow request; used for confirming completion reply. /// Unique id for last reflow request; used for confirming completion reply.
pub last_reflow_id: Traceable<Cell<uint>>, last_reflow_id: Traceable<Cell<uint>>,
/// The outermost frame containing the document, window, and page URL. /// The outermost frame containing the document, window, and page URL.
pub frame: Traceable<RefCell<Option<Frame>>>, pub frame: Traceable<RefCell<Option<Frame>>>,
@ -140,29 +140,29 @@ pub struct Page {
pub layout_chan: Untraceable<LayoutChan>, pub layout_chan: Untraceable<LayoutChan>,
/// The port that we will use to join layout. If this is `None`, then layout is not running. /// The port that we will use to join layout. If this is `None`, then layout is not running.
pub layout_join_port: Untraceable<RefCell<Option<Receiver<()>>>>, layout_join_port: Untraceable<RefCell<Option<Receiver<()>>>>,
/// What parts of the document are dirty, if any. /// What parts of the document are dirty, if any.
pub damage: Traceable<RefCell<Option<DocumentDamage>>>, damage: Traceable<RefCell<Option<DocumentDamage>>>,
/// The current size of the window, in pixels. /// The current size of the window, in pixels.
pub window_size: Untraceable<Cell<Size2D<uint>>>, window_size: Untraceable<Cell<Size2D<uint>>>,
pub js_info: Traceable<RefCell<Option<JSPageInfo>>>, js_info: Traceable<RefCell<Option<JSPageInfo>>>,
/// Cached copy of the most recent url loaded by the script /// Cached copy of the most recent url loaded by the script
/// TODO(tkuehn): this currently does not follow any particular caching policy /// TODO(tkuehn): this currently does not follow any particular caching policy
/// and simply caches pages forever (!). The bool indicates if reflow is required /// and simply caches pages forever (!). The bool indicates if reflow is required
/// when reloading. /// when reloading.
pub url: Untraceable<RefCell<Option<(Url, bool)>>>, url: Untraceable<RefCell<Option<(Url, bool)>>>,
pub next_subpage_id: Untraceable<Cell<SubpageId>>, next_subpage_id: Untraceable<Cell<SubpageId>>,
/// Pending resize event, if any. /// Pending resize event, if any.
pub 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
pub fragment_node: Traceable<RefCell<Option<JS<Element>>>>, fragment_node: Traceable<RefCell<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>,
@ -229,10 +229,6 @@ impl Page {
} }
} }
fn id(&self) -> PipelineId {
self.id
}
// must handle root case separately // must handle root case separately
pub fn remove(&self, id: PipelineId) -> Option<Rc<Page>> { pub fn remove(&self, id: PipelineId) -> Option<Rc<Page>> {
let remove_idx = { let remove_idx = {
@ -246,7 +242,7 @@ impl Page {
let page_tree = unsafe { let page_tree = unsafe {
cast::transmute_lifetime(page_tree) cast::transmute_lifetime(page_tree)
}; };
page_tree.id() == id page_tree.id == id
}) })
.map(|(idx, _)| idx) .map(|(idx, _)| idx)
}; };
@ -545,29 +541,29 @@ impl Drop for StackRootTLS {
/// FIXME: Rename to `Page`, following WebKit? /// FIXME: Rename to `Page`, following WebKit?
pub struct ScriptTask { pub struct ScriptTask {
/// A handle to the information pertaining to page layout /// A handle to the information pertaining to page layout
pub page: RefCell<Rc<Page>>, page: RefCell<Rc<Page>>,
/// A handle to the image cache task. /// A handle to the image cache task.
pub image_cache_task: ImageCacheTask, image_cache_task: ImageCacheTask,
/// A handle to the resource task. /// A handle to the resource task.
pub resource_task: ResourceTask, resource_task: ResourceTask,
/// The port on which the script task receives messages (load URL, exit, etc.) /// The port on which the script task receives messages (load URL, exit, etc.)
pub port: Receiver<ScriptMsg>, port: Receiver<ScriptMsg>,
/// A channel to hand out when some other task needs to be able to respond to a message from /// A channel to hand out when some other task needs to be able to respond to a message from
/// the script task. /// the script task.
pub chan: ScriptChan, chan: ScriptChan,
/// For communicating load url messages to the constellation /// For communicating load url messages to the constellation
pub constellation_chan: ConstellationChan, constellation_chan: ConstellationChan,
/// A handle to the compositor for communicating ready state messages. /// A handle to the compositor for communicating ready state messages.
pub compositor: Box<ScriptListener>, compositor: Box<ScriptListener>,
/// The JavaScript runtime. /// The JavaScript runtime.
pub js_runtime: js::rust::rt, js_runtime: js::rust::rt,
/// The JSContext. /// The JSContext.
pub js_context: RefCell<Option<Rc<Cx>>>, js_context: RefCell<Option<Rc<Cx>>>,
pub mouse_over_targets: RefCell<Option<Vec<JS<Node>>>> mouse_over_targets: RefCell<Option<Vec<JS<Node>>>>
} }
/// In the event of task failure, all data on the stack runs its destructor. However, there /// In the event of task failure, all data on the stack runs its destructor. However, there