Merge pull request #3458 from pcwalton/whitespace-nowrap

layout: Implement `white-space: nowrap`.
This commit is contained in:
Patrick Walton 2014-09-23 20:22:33 -07:00
commit d9f836bc75
6 changed files with 122 additions and 15 deletions

View file

@ -124,7 +124,7 @@ impl TextRunScanner {
let font_style = old_fragment.font_style();
let compression = match old_fragment.white_space() {
white_space::normal => CompressWhitespaceNewline,
white_space::normal | white_space::nowrap => CompressWhitespaceNewline,
white_space::pre => CompressNone,
};
@ -168,7 +168,7 @@ impl TextRunScanner {
let fontgroup = font_context.get_layout_font_group_for_style(&font_style);
let compression = match in_fragment.white_space() {
white_space::normal => CompressWhitespaceNewline,
white_space::normal | white_space::nowrap => CompressWhitespaceNewline,
white_space::pre => CompressNone,
};