Fix #12193 Servo displays upper level Thai character in wrong place.

This commit is contained in:
Vee Satayamas 2016-08-17 18:57:19 +07:00 committed by Josh Matthews
parent 5e888b5504
commit c69567406e
2 changed files with 6 additions and 9 deletions

View file

@ -254,10 +254,10 @@ impl<'a> DetailedGlyphStore {
let i = self.detail_lookup.binary_search(&key) let i = self.detail_lookup.binary_search(&key)
.expect("Invalid index not found in detailed glyph lookup table!"); .expect("Invalid index not found in detailed glyph lookup table!");
let main_detail_offset = self.detail_lookup[i].detail_offset;
assert!(i + (count as usize) <= self.detail_buffer.len()); assert!(main_detail_offset + (count as usize) <= self.detail_buffer.len());
// return a slice into the buffer // return a slice into the buffer
&self.detail_buffer[i .. i + count as usize] &self.detail_buffer[main_detail_offset .. main_detail_offset + count as usize]
} }
fn detailed_glyph_with_index(&'a self, fn detailed_glyph_with_index(&'a self,
@ -274,9 +274,9 @@ impl<'a> DetailedGlyphStore {
let i = self.detail_lookup.binary_search(&key) let i = self.detail_lookup.binary_search(&key)
.expect("Invalid index not found in detailed glyph lookup table!"); .expect("Invalid index not found in detailed glyph lookup table!");
let main_detail_offset = self.detail_lookup[i].detail_offset;
assert!(i + (detail_offset as usize) < self.detail_buffer.len()); assert!(main_detail_offset + (detail_offset as usize) < self.detail_buffer.len());
&self.detail_buffer[i + (detail_offset as usize)] &self.detail_buffer[main_detail_offset + (detail_offset as usize)]
} }
fn ensure_sorted(&mut self) { fn ensure_sorted(&mut self) {

View file

@ -1,3 +0,0 @@
[word-break-break-all-007.htm]
type: reftest
expected: FAIL