Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove min/max functions from util::geometry. Use std::cmp instead.

Browse source
This commit is contained in:
Simon Sapin 2014-09-19 13:56:35 +01:00
parent 415bbaeb2e
commit 010d87b93e
10 changed files with 39 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/model.rs
View file

@ -13,8 +13,8 @@ use geom::SideOffsets2D;
use style::computed_values::{LPA_Auto, LPA_Length, LPA_Percentage, LP_Length, LP_Percentage};
use style::ComputedValues;
use servo_util::geometry::Au;
use servo_util::geometry;
use servo_util::logical_geometry::LogicalMargin;
use std::cmp::{max, min};
use std::fmt;
/// A collapsible margin. See CSS 2.1 § 8.3.1.
@ -50,8 +50,8 @@ impl AdjoiningMargins {
}
pub fn union(&mut self, other: AdjoiningMargins) {
self.most_positive = geometry::max(self.most_positive, other.most_positive);
self.most_negative = geometry::min(self.most_negative, other.most_negative)
self.most_positive = max(self.most_positive, other.most_positive);
self.most_negative = min(self.most_negative, other.most_negative)
}
pub fn collapse(&self) -> Au {