diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-02-11 23:05:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 23:05:37 -0500 |
| commit | 6d6d16f7f492e6346f0391e352015226a4444806 (patch) | |
| tree | d991c986a7f83be25157934e93c248ea86ee4b00 /components/gfx/text | |
| parent | baac1e2c69d3b6e840ced2be4b5e03bb39bd40d5 (diff) | |
| parent | d1f8d576f83714fe674a36c5b718341c236312e6 (diff) | |
| download | servo-6d6d16f7f492e6346f0391e352015226a4444806.tar.gz servo-6d6d16f7f492e6346f0391e352015226a4444806.zip | |
Auto merge of #25717 - emilio:gecko-sync, r=emilio,nox
style: Sync changes from mozilla-central.
See individual commits for details. https://bugzilla.mozilla.org/show_bug.cgi?id=1614394
Diffstat (limited to 'components/gfx/text')
| -rw-r--r-- | components/gfx/text/shaping/harfbuzz.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/components/gfx/text/shaping/harfbuzz.rs b/components/gfx/text/shaping/harfbuzz.rs index 9599dd61a12..47cf337011b 100644 --- a/components/gfx/text/shaping/harfbuzz.rs +++ b/components/gfx/text/shaping/harfbuzz.rs @@ -434,9 +434,7 @@ impl Shaper { // We elect to only space the two required code points. if character == ' ' || character == '\u{a0}' { // https://drafts.csswg.org/css-text-3/#word-spacing-property - let (length, percent) = options.word_spacing; - advance = - (advance + length) + Au::new((advance.0 as f32 * percent.into_inner()) as i32); + advance += options.word_spacing; } advance |