aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/inline.rs
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2015-01-07 16:05:10 -0800
committerSimon Sapin <simon.sapin@exyr.org>2015-03-03 17:03:27 +0100
commita82fc00806edf63672a660827117c743ef03c63f (patch)
treec3c9111b051dd6a4709538ed165adf44c1ef2166 /components/layout/inline.rs
parent417a932e306438b5cda7a7071412a34d3e503f94 (diff)
downloadservo-a82fc00806edf63672a660827117c743ef03c63f.tar.gz
servo-a82fc00806edf63672a660827117c743ef03c63f.zip
layout: Implement `overflow-x` and `overflow-y` per CSS-OVERFLOW § 3.
Fragmentation is not yet supported.
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r--components/layout/inline.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index a5ca5038c30..0a4b575c3c4 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -34,7 +34,7 @@ use std::mem;
use std::num::ToPrimitive;
use std::ops::{Add, Sub, Mul, Div, Rem, Neg, Shl, Shr, Not, BitOr, BitAnd, BitXor};
use std::u16;
-use style::computed_values::{overflow, text_align, text_justify, text_overflow, vertical_align};
+use style::computed_values::{overflow_x, text_align, text_justify, text_overflow, vertical_align};
use style::computed_values::{white_space};
use style::properties::ComputedValues;
use std::sync::Arc;
@@ -653,8 +653,8 @@ impl LineBreaker {
let available_inline_size = self.pending_line.green_zone.inline -
self.pending_line.bounds.size.inline - indentation;
match (fragment.style().get_inheritedtext().text_overflow,
- fragment.style().get_box().overflow) {
- (text_overflow::T::clip, _) | (_, overflow::T::visible) => {}
+ fragment.style().get_box().overflow_x) {
+ (text_overflow::T::clip, _) | (_, overflow_x::T::visible) => {}
(text_overflow::T::ellipsis, _) => {
need_ellipsis = fragment.border_box.size.inline > available_inline_size;
}