diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index 1b459ca7f05..12035753527 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -131,7 +131,7 @@ pub struct Page { pub subpage_id: Option, /// Unique id for last reflow request; used for confirming completion reply. - pub last_reflow_id: Traceable>, + last_reflow_id: Traceable>, /// The outermost frame containing the document, window, and page URL. pub frame: Traceable>>, @@ -140,29 +140,29 @@ pub struct Page { pub layout_chan: Untraceable, /// The port that we will use to join layout. If this is `None`, then layout is not running. - pub layout_join_port: Untraceable>>>, + layout_join_port: Untraceable>>>, /// What parts of the document are dirty, if any. - pub damage: Traceable>>, + damage: Traceable>>, /// The current size of the window, in pixels. - pub window_size: Untraceable>>, + window_size: Untraceable>>, - pub js_info: Traceable>>, + js_info: Traceable>>, /// Cached copy of the most recent url loaded by the script /// TODO(tkuehn): this currently does not follow any particular caching policy /// and simply caches pages forever (!). The bool indicates if reflow is required /// when reloading. - pub url: Untraceable>>, + url: Untraceable>>, - pub next_subpage_id: Untraceable>, + next_subpage_id: Untraceable>, /// Pending resize event, if any. - pub resize_event: Untraceable>>>, + resize_event: Untraceable>>>, /// Pending scroll to fragment event, if any - pub fragment_node: Traceable>>>, + fragment_node: Traceable>>>, /// Associated resource task for use by DOM objects like XMLHttpRequest pub resource_task: Untraceable, @@ -229,10 +229,6 @@ impl Page { } } - fn id(&self) -> PipelineId { - self.id - } - // must handle root case separately pub fn remove(&self, id: PipelineId) -> Option> { let remove_idx = { @@ -246,7 +242,7 @@ impl Page { let page_tree = unsafe { cast::transmute_lifetime(page_tree) }; - page_tree.id() == id + page_tree.id == id }) .map(|(idx, _)| idx) }; @@ -545,29 +541,29 @@ impl Drop for StackRootTLS { /// FIXME: Rename to `Page`, following WebKit? pub struct ScriptTask { /// A handle to the information pertaining to page layout - pub page: RefCell>, + page: RefCell>, /// A handle to the image cache task. - pub image_cache_task: ImageCacheTask, + image_cache_task: ImageCacheTask, /// 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.) - pub port: Receiver, + port: Receiver, /// A channel to hand out when some other task needs to be able to respond to a message from /// the script task. - pub chan: ScriptChan, + chan: ScriptChan, /// 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. - pub compositor: Box, + compositor: Box, /// The JavaScript runtime. - pub js_runtime: js::rust::rt, + js_runtime: js::rust::rt, /// The JSContext. - pub js_context: RefCell>>, + js_context: RefCell>>, - pub mouse_over_targets: RefCell>>> + mouse_over_targets: RefCell>>> } /// In the event of task failure, all data on the stack runs its destructor. However, there