diff options
| -rw-r--r-- | components/script/dom/window.rs | 6 | ||||
| -rw-r--r-- | components/script/layout_interface.rs | 2 | ||||
| -rw-r--r-- | components/script/script_task.rs | 2 | ||||
| -rw-r--r-- | components/script_traits/lib.rs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index ce7dc34e77d..bf3f07990ae 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -119,7 +119,7 @@ pub struct Window { parent_info: Option<(PipelineId, SubpageId)>, /// Unique id for last reflow request; used for confirming completion reply. - last_reflow_id: Cell<uint>, + last_reflow_id: Cell<u32>, /// Global static data related to the DOM. dom_static: GlobalStaticData, @@ -460,7 +460,7 @@ pub trait WindowHelpers { fn layout(&self) -> &LayoutRPC; fn content_box_query(self, content_box_request: TrustedNodeAddress) -> Rect<Au>; fn content_boxes_query(self, content_boxes_request: TrustedNodeAddress) -> Vec<Rect<Au>>; - fn handle_reflow_complete_msg(self, reflow_id: uint); + fn handle_reflow_complete_msg(self, reflow_id: u32); fn handle_resize_inactive_msg(self, new_size: WindowSizeData); fn set_fragment_name(self, fragment: Option<String>); fn steal_fragment_name(self) -> Option<String>; @@ -631,7 +631,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> { rects } - fn handle_reflow_complete_msg(self, reflow_id: uint) { + fn handle_reflow_complete_msg(self, reflow_id: u32) { let last_reflow_id = self.last_reflow_id.get(); if last_reflow_id == reflow_id { *self.layout_join_port.borrow_mut() = None; diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index e14475aa793..9b7e3a292ea 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -115,7 +115,7 @@ pub struct Reflow { /// The channel that we send a notification to. pub script_join_chan: Sender<()>, /// Unique identifier - pub id: uint, + pub id: u32, /// The type of query if any to perform during this reflow. pub query_type: ReflowQueryType, /// A clipping rectangle for the page, an enlarged rectangle containing the viewport. diff --git a/components/script/script_task.rs b/components/script/script_task.rs index e5463285200..b267c036435 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -846,7 +846,7 @@ impl ScriptTask { } /// Handles a notification that reflow completed. - fn handle_reflow_complete_msg(&self, pipeline_id: PipelineId, reflow_id: uint) { + fn handle_reflow_complete_msg(&self, pipeline_id: PipelineId, reflow_id: u32) { debug!("Script: Reflow {:?} complete for {:?}", reflow_id, pipeline_id); let page = self.root_page(); let page = page.find(pipeline_id).expect( diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 5b4be3731b2..da93a143dc2 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -61,7 +61,7 @@ pub enum ConstellationControlMsg { /// Sends a DOM event. SendEvent(PipelineId, CompositorEvent), /// Notifies script that reflow is finished. - ReflowComplete(PipelineId, uint), + ReflowComplete(PipelineId, u32), /// Notifies script of the viewport. Viewport(PipelineId, Rect<f32>), /// Requests that the script task immediately send the constellation the title of a pipeline. |