diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2017-05-31 14:12:28 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-06-02 10:21:22 +0200 |
| commit | 2c7fbb4b4c9d0468caf61d9c9b33331987ad8de7 (patch) | |
| tree | ca0ebdbab8d5d0731580a542078037e2f20f859e /components/layout | |
| parent | 5c6987a50df3a065452dfca3144910cfd5008d5f (diff) | |
| download | servo-2c7fbb4b4c9d0468caf61d9c9b33331987ad8de7.tar.gz servo-2c7fbb4b4c9d0468caf61d9c9b33331987ad8de7.zip | |
Use generics for text spacing properties
Diffstat (limited to 'components/layout')
| -rw-r--r-- | components/layout/text.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/layout/text.rs b/components/layout/text.rs index 969e5f0786b..481e2025201 100644 --- a/components/layout/text.rs +++ b/components/layout/text.rs @@ -166,8 +166,8 @@ impl TextRunScanner { white_space::T::pre_line => CompressionMode::CompressWhitespace, }; text_transform = inherited_text_style.text_transform; - letter_spacing = inherited_text_style.letter_spacing.0; - word_spacing = inherited_text_style.word_spacing.0 + letter_spacing = inherited_text_style.letter_spacing; + word_spacing = inherited_text_style.word_spacing.value().cloned() .map(|lop| lop.to_hash_key()) .unwrap_or((Au(0), NotNaN::new(0.0).unwrap())); text_rendering = inherited_text_style.text_rendering; @@ -289,8 +289,8 @@ impl TextRunScanner { // example, `finally` with a wide `letter-spacing` renders as `f i n a l l y` and not // `fi n a l l y`. let mut flags = ShapingFlags::empty(); - match letter_spacing { - Some(Au(0)) | None => {} + match letter_spacing.value() { + Some(&Au(0)) | None => {} Some(_) => flags.insert(IGNORE_LIGATURES_SHAPING_FLAG), } if text_rendering == text_rendering::T::optimizespeed { @@ -301,7 +301,7 @@ impl TextRunScanner { flags.insert(KEEP_ALL_FLAG); } let options = ShapingOptions { - letter_spacing: letter_spacing, + letter_spacing: letter_spacing.value().cloned(), word_spacing: word_spacing, script: Script::Common, flags: flags, |