diff --git a/components/gfx/text/glyph.rs b/components/gfx/text/glyph.rs
index c5f803ca673..8ecffcf142d 100644
--- a/components/gfx/text/glyph.rs
+++ b/components/gfx/text/glyph.rs
@@ -522,7 +522,7 @@ int_range_index! {
     #[derive(RustcEncodable)]
     #[doc = "An index that refers to a character in a text run. This could \
              point to the middle of a glyph."]
-    struct CharIndex(int)
+    struct CharIndex(isize)
 }
 
 impl<'a> GlyphStore {
@@ -540,7 +540,7 @@ impl<'a> GlyphStore {
     }
 
     pub fn char_len(&self) -> CharIndex {
-        CharIndex(self.entry_buffer.len() as int)
+        CharIndex(self.entry_buffer.len() as isize)
     }
 
     pub fn is_whitespace(&self) -> bool {
@@ -743,8 +743,8 @@ impl<'a> GlyphStore {
 pub struct GlyphIterator<'a> {
     store: &'a GlyphStore,
     char_index: CharIndex,
-    char_range: EachIndex<int, CharIndex>,
-    glyph_range: Option<EachIndex<int, CharIndex>>,
+    char_range: EachIndex<isize, CharIndex>,
+    glyph_range: Option<EachIndex<isize, CharIndex>>,
 }
 
 impl<'a> GlyphIterator<'a> {
@@ -767,7 +767,7 @@ impl<'a> GlyphIterator<'a> {
     fn next_complex_glyph(&mut self, entry: &GlyphEntry, i: CharIndex)
                           -> Option<(CharIndex, GlyphInfo<'a>)> {
         let glyphs = self.store.detail_store.get_detailed_glyphs_for_entry(i, entry.glyph_count());
-        self.glyph_range = Some(range::each_index(CharIndex(0), CharIndex(glyphs.len() as int)));
+        self.glyph_range = Some(range::each_index(CharIndex(0), CharIndex(glyphs.len() as isize)));
         self.next()
     }
 }
diff --git a/components/layout/text.rs b/components/layout/text.rs
index 66a7597c891..6380a4fe6ce 100644
--- a/components/layout/text.rs
+++ b/components/layout/text.rs
@@ -138,7 +138,7 @@ impl TextRunScanner {
                 };
 
                 let mut new_line_pos = Vec::new();
-                let old_length = CharIndex(run_text.chars().count() as int);
+                let old_length = CharIndex(run_text.chars().count() as isize);
                 last_whitespace = util::transform_text(in_fragment.as_slice(),
                                                        compression,
                                                        last_whitespace,
@@ -146,7 +146,7 @@ impl TextRunScanner {
                                                        &mut new_line_pos);
                 new_line_positions.push(NewLinePositions(new_line_pos));
 
-                let added_chars = CharIndex(run_text.chars().count() as int) - old_length;
+                let added_chars = CharIndex(run_text.chars().count() as isize) - old_length;
                 new_ranges.push(Range::new(char_total, added_chars));
                 char_total = char_total + added_chars;
             }