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

Update app_units to 0.4.1

Browse source
This commit is contained in:
Manish Goregaokar 2017-05-17 13:07:12 -07:00
parent f05491166f
commit 2230332f46
16 changed files with 39 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/Cargo.toml
View file

@ -10,7 +10,7 @@ name = "layout"
path = "lib.rs"
[dependencies]
app_units = "0.4"
app_units = "0.4.1"
atomic_refcell = "0.1"
bitflags = "0.7"
canvas_traits = {path = "../canvas_traits"}

13
components/layout/floats.rs
View file

@ -2,13 +2,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use app_units::Au;
use app_units::{Au, MAX_AU};
use block::FormattingContextType;
use flow::{self, CLEARS_LEFT, CLEARS_RIGHT, Flow, ImmutableFlowUtils};
use persistent_list::PersistentList;
use std::cmp::{max, min};
use std::fmt;
use std::i32;
use style::computed_values::float;
use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
use style::values::computed::LengthOrPercentageOrAuto;
@ -319,7 +318,7 @@ impl Floats {
Au(0),
info.ceiling,
info.max_inline_size,
Au(i32::MAX))
MAX_AU)
}
FloatKind::Right => {
return LogicalRect::new(
@ -327,7 +326,7 @@ impl Floats {
info.max_inline_size - info.size.inline,
info.ceiling,
info.max_inline_size,
Au(i32::MAX))
MAX_AU)
}
}
}
@ -352,7 +351,7 @@ impl Floats {
Au(0),
float_b,
info.max_inline_size,
Au(i32::MAX))
MAX_AU)
}
FloatKind::Right => {
LogicalRect::new(
@ -360,7 +359,7 @@ impl Floats {
info.max_inline_size - info.size.inline,
float_b,
info.max_inline_size,
Au(i32::MAX))
MAX_AU)
}
}
}
@ -373,7 +372,7 @@ impl Floats {
let block_size = self.max_block_size_for_bounds(rect.start.i,
rect.start.b,
rect.size.inline);
let block_size = block_size.unwrap_or(Au(i32::MAX));
let block_size = block_size.unwrap_or(MAX_AU);
return match info.kind {
FloatKind::Left => {
LogicalRect::new(

8
components/layout/fragment.rs
View file

@ -1058,7 +1058,7 @@ impl Fragment {
// Note: We can not precompute the ratio and store it as a float, because
// doing so may result one pixel difference in calculation for certain
// images, thus make some tests fail.
Au((inline_size.0 as i64 * intrinsic_block_size.0 as i64 /
Au::new((inline_size.0 as i64 * intrinsic_block_size.0 as i64 /
intrinsic_inline_size.0 as i64) as i32)
} else {
intrinsic_block_size
@ -1068,7 +1068,7 @@ impl Fragment {
(MaybeAuto::Auto, MaybeAuto::Specified(block_size)) => {
let block_size = block_constraint.clamp(block_size);
let inline_size = if self.has_intrinsic_ratio() {
Au((block_size.0 as i64 * intrinsic_inline_size.0 as i64 /
Au::new((block_size.0 as i64 * intrinsic_inline_size.0 as i64 /
intrinsic_block_size.0 as i64) as i32)
} else {
intrinsic_inline_size
@ -1084,10 +1084,10 @@ impl Fragment {
// First, create two rectangles that keep aspect ratio while may be clamped
// by the contraints;
let first_isize = inline_constraint.clamp(intrinsic_inline_size);
let first_bsize = Au((first_isize.0 as i64 * intrinsic_block_size.0 as i64 /
let first_bsize = Au::new((first_isize.0 as i64 * intrinsic_block_size.0 as i64 /
intrinsic_inline_size.0 as i64) as i32);
let second_bsize = block_constraint.clamp(intrinsic_block_size);
let second_isize = Au((second_bsize.0 as i64 * intrinsic_inline_size.0 as i64 /
let second_isize = Au::new((second_bsize.0 as i64 * intrinsic_inline_size.0 as i64 /
intrinsic_block_size.0 as i64) as i32);
let (inline_size, block_size) = match (first_isize.cmp(&intrinsic_inline_size) ,
second_isize.cmp(&intrinsic_inline_size)) {

4
components/layout/inline.rs
View file

@ -5,7 +5,7 @@
#![deny(unsafe_code)]
use StyleArc;
use app_units::Au;
use app_units::{Au, MIN_AU};
use block::AbsoluteAssignBSizesTraversal;
use context::LayoutContext;
use display_list_builder::{DisplayListBuildState, InlineFlowDisplayListBuilding};
@ -1113,7 +1113,7 @@ impl InlineFlow {
let line_height = text::line_height_from_style(style, &font_metrics);
let inline_metrics = InlineMetrics::from_font_metrics(&font_metrics, line_height);
let mut line_metrics = LineMetrics::new(Au(0), Au(i32::MIN));
let mut line_metrics = LineMetrics::new(Au(0), MIN_AU);
let mut largest_block_size_for_top_fragments = Au(0);
let mut largest_block_size_for_bottom_fragments = Au(0);