From 4a4eeb70ecb1bf343e6cb54905eb463c70ac7d4a Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Fri, 16 May 2014 17:07:13 -0700 Subject: [PATCH] Fix linebreak regression Fixes #2457 --- src/components/main/layout/inline.rs | 4 ++-- src/test/ref/basic.list | 1 + src/test/ref/linebreak_simple_a.html | 3 +++ src/test/ref/linebreak_simple_b.html | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 src/test/ref/linebreak_simple_a.html create mode 100644 src/test/ref/linebreak_simple_b.html diff --git a/src/components/main/layout/inline.rs b/src/components/main/layout/inline.rs index d4039e28112..5b0557c2c4d 100644 --- a/src/components/main/layout/inline.rs +++ b/src/components/main/layout/inline.rs @@ -192,11 +192,11 @@ impl fmt::Show for LineIndices { } pub fn each_fragment_index(range: &Range) -> EachIndex { - range::each_index(range.begin().fragment_index, range.length().fragment_index) + range::each_index(range.begin().fragment_index, range.end().fragment_index) } pub fn each_char_index(range: &Range) -> EachIndex { - range::each_index(range.begin().char_index, range.length().char_index) + range::each_index(range.begin().char_index, range.end().char_index) } struct LineboxScanner { diff --git a/src/test/ref/basic.list b/src/test/ref/basic.list index 81b8f7761dd..43def47ea67 100644 --- a/src/test/ref/basic.list +++ b/src/test/ref/basic.list @@ -70,3 +70,4 @@ == background_repeat_both_a.html background_repeat_both_b.html == setattribute_id_restyle_a.html setattribute_id_restyle_b.html == pseudo_element_a.html pseudo_element_b.html +== linebreak_simple_a.html linebreak_simple_b.html diff --git a/src/test/ref/linebreak_simple_a.html b/src/test/ref/linebreak_simple_a.html new file mode 100644 index 00000000000..0a9ee7bbb30 --- /dev/null +++ b/src/test/ref/linebreak_simple_a.html @@ -0,0 +1,3 @@ + +

A hahahahahhahahhahahhahahhahahhahahhahahhahahahhahah fruitloopsfruitloopsfruitloops + diff --git a/src/test/ref/linebreak_simple_b.html b/src/test/ref/linebreak_simple_b.html new file mode 100644 index 00000000000..a5eb48e225f --- /dev/null +++ b/src/test/ref/linebreak_simple_b.html @@ -0,0 +1,5 @@ + +

A

+

hahahahahhahahhahahhahahhahahhahahhahahhahahahhahah

+

fruitloopsfruitloopsfruitloops

+