diff options
Diffstat (limited to 'components/layout')
| -rw-r--r-- | components/layout/flow.rs | 7 | ||||
| -rw-r--r-- | components/layout/inline.rs | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/components/layout/flow.rs b/components/layout/flow.rs index ebc78b6197f..bceaef0b2c8 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -53,7 +53,6 @@ use servo_util::geometry::Au; use servo_util::logical_geometry::WritingMode; use servo_util::logical_geometry::{LogicalRect, LogicalSize}; use std::mem; -use std::num::Zero; use std::fmt; use std::iter::Zip; use std::raw; @@ -686,7 +685,7 @@ impl AbsolutePositionInfo { // of the root layer. AbsolutePositionInfo { relative_containing_block_size: LogicalSize::zero(writing_mode), - stacking_relative_position_of_absolute_containing_block: Zero::zero(), + stacking_relative_position_of_absolute_containing_block: Point2D::zero(), layers_needed_for_positioned_flows: false, } } @@ -902,7 +901,7 @@ impl BaseFlow { parallel: FlowParallelInfo::new(), floats: Floats::new(writing_mode), collapsible_margins: CollapsibleMargins::new(), - stacking_relative_position: Zero::zero(), + stacking_relative_position: Point2D::zero(), abs_descendants: Descendants::new(), absolute_static_i_offset: Au(0), fixed_static_i_offset: Au(0), @@ -911,7 +910,7 @@ impl BaseFlow { absolute_cb: ContainingBlockLink::new(), display_list_building_result: DisplayListBuildingResult::None, absolute_position_info: AbsolutePositionInfo::new(writing_mode), - clip_rect: Rect(Zero::zero(), Size2D(Au(0), Au(0))), + clip_rect: Rect(Point2D::zero(), Size2D::zero()), flags: flags, writing_mode: writing_mode, } diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 70b933dcacf..c3c531fcfdf 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -28,12 +28,11 @@ use gfx::text::glyph::CharIndex; use servo_util::geometry::Au; use servo_util::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; use servo_util::opts; -use servo_util::range::{IntRangeIndex, Range, RangeIndex}; +use servo_util::range::{Range, RangeIndex}; use servo_util::arc_ptr_eq; use std::cmp::max; use std::fmt; use std::mem; -use std::num; use std::u16; use style::computed_values::{text_align, vertical_align, white_space}; use style::ComputedValues; @@ -211,7 +210,7 @@ impl LineBreaker { /// Reinitializes the pending line to blank data. fn reset_line(&mut self) { - self.pending_line.range.reset(num::zero(), num::zero()); + self.pending_line.range.reset(FragmentIndex(0), FragmentIndex(0)); self.pending_line.bounds = LogicalRect::new(self.floats.writing_mode, Au(0), self.cur_b, @@ -632,7 +631,7 @@ impl LineBreaker { if self.pending_line_is_empty() { assert!(self.new_fragments.len() <= (u16::MAX as uint)); self.pending_line.range.reset(FragmentIndex(self.new_fragments.len() as int), - num::zero()); + FragmentIndex(0)); } self.pending_line.range.extend_by(FragmentIndex(1)); @@ -655,7 +654,7 @@ impl LineBreaker { /// Returns true if the pending line is empty and false otherwise. fn pending_line_is_empty(&self) -> bool { - self.pending_line.range.length() == num::zero() + self.pending_line.range.length() == FragmentIndex(0) } } |