From 14c524df4f38a8b8262b3ba458c100966377d072 Mon Sep 17 00:00:00 2001
From: Behnam Esfahbod <behnam@zwnj.org>
Date: Tue, 16 May 2017 11:38:42 -0500
Subject: [gfx] [layout] [style] Upgrade unicode-bidi to 0.3

---
 components/gfx/text/text_run.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'components/gfx/text')

diff --git a/components/gfx/text/text_run.rs b/components/gfx/text/text_run.rs
index 0f487a4b70e..b65700221f7 100644
--- a/components/gfx/text/text_run.rs
+++ b/components/gfx/text/text_run.rs
@@ -13,6 +13,7 @@ use std::slice::Iter;
 use std::sync::Arc;
 use style::str::char_is_whitespace;
 use text::glyph::{ByteIndex, GlyphStore};
+use unicode_bidi as bidi;
 use webrender_traits;
 use xi_unicode::LineBreakIterator;
 
@@ -32,7 +33,7 @@ pub struct TextRun {
     pub font_key: webrender_traits::FontKey,
     /// The glyph runs that make up this text run.
     pub glyphs: Arc<Vec<GlyphRun>>,
-    pub bidi_level: u8,
+    pub bidi_level: bidi::Level,
     pub extra_word_spacing: Au,
 }
 
@@ -179,7 +180,7 @@ impl<'a> Iterator for CharacterSliceIterator<'a> {
 }
 
 impl<'a> TextRun {
-    pub fn new(font: &mut Font, text: String, options: &ShapingOptions, bidi_level: u8) -> TextRun {
+    pub fn new(font: &mut Font, text: String, options: &ShapingOptions, bidi_level: bidi::Level) -> TextRun {
         let glyphs = TextRun::break_and_shape(font, &text, options);
         TextRun {
             text: Arc::new(text),
@@ -340,7 +341,7 @@ impl<'a> TextRun {
     pub fn natural_word_slices_in_visual_order(&'a self, range: &Range<ByteIndex>)
                                         -> NaturalWordSliceIterator<'a> {
         // Iterate in reverse order if bidi level is RTL.
-        let reverse = self.bidi_level % 2 == 1;
+        let reverse = self.bidi_level.is_rtl();
 
         let index = if reverse {
             match self.index_of_first_glyph_run_containing(range.end() - ByteIndex(1)) {
-- 
cgit v1.2.3