diff options
| author | Ms2ger <ms2ger@gmail.com> | 2015-04-02 14:53:10 +0200 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2015-04-02 14:53:10 +0200 |
| commit | 232dadc81d396ecee4cc3c13b725055bb7e70b2e (patch) | |
| tree | 3a9948a1297e90097aeda82754d3f46df878f3a8 /components/layout | |
| parent | 2cc3c1d9c2c54a00dc4526a10cef1375e5af5280 (diff) | |
| download | servo-232dadc81d396ecee4cc3c13b725055bb7e70b2e.tar.gz servo-232dadc81d396ecee4cc3c13b725055bb7e70b2e.zip | |
Use isize for FragmentIndex.
Diffstat (limited to 'components/layout')
| -rw-r--r-- | components/layout/inline.rs | 6 | ||||
| -rw-r--r-- | components/layout/layout_task.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 5dd4ecf36e3..1d57eb16843 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -154,7 +154,7 @@ pub struct Line { int_range_index! { #[derive(RustcEncodable)] #[doc = "The index of a fragment in a flattened vector of DOM elements."] - struct FragmentIndex(int) + struct FragmentIndex(isize) } bitflags! { @@ -642,8 +642,8 @@ impl LineBreaker { fn push_fragment_to_line(&mut self, layout_context: &LayoutContext, fragment: Fragment) { let indentation = self.indentation_for_pending_fragment(); if self.pending_line_is_empty() { - assert!(self.new_fragments.len() <= (u16::MAX as uint)); - self.pending_line.range.reset(FragmentIndex(self.new_fragments.len() as int), + assert!(self.new_fragments.len() <= (u16::MAX as usize)); + self.pending_line.range.reset(FragmentIndex(self.new_fragments.len() as isize), FragmentIndex(0)); } diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index 33bf00e837f..0f29cc91902 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -192,7 +192,7 @@ impl ImageResponder<UntrustedNodeAddress> for LayoutImageResponder { let script_chan = self.script_chan.clone(); box move |_, node_address| { let ScriptControlChan(ref chan) = script_chan; - debug!("Dirtying {:x}", node_address.0 as uint); + debug!("Dirtying {:x}", node_address.0 as usize); let mut nodes = SmallVec1::new(); nodes.vec_push(node_address); drop(chan.send(ConstellationControlMsg::SendEvent( |