From 683749c999b00679b022ece3fe4845667f40598d Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 2 Apr 2015 15:02:15 +0200 Subject: [PATCH] Use isize for Au::from_px. --- components/layout/display_list_builder.rs | 4 ++-- components/layout/fragment.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index d4a2e7c7e38..46a1665284b 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -345,8 +345,8 @@ impl FragmentDisplayListBuilding for Fragment { // wide. let image_aspect_ratio = (image.width as f64) / (image.height as f64); let bounds_aspect_ratio = bounds.size.width.to_subpx() / bounds.size.height.to_subpx(); - let intrinsic_size = Size2D(Au::from_px(image.width as int), - Au::from_px(image.height as int)); + let intrinsic_size = Size2D(Au::from_px(image.width as isize), + Au::from_px(image.height as isize)); match (style.get_background().background_size.clone(), image_aspect_ratio < bounds_aspect_ratio) { (background_size::T::Contain, false) | (background_size::T::Cover, true) => { diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 3d30a13a419..9fe2b97eb00 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -274,8 +274,8 @@ impl CanvasFragmentInfo { pub fn new(node: &ThreadSafeLayoutNode) -> CanvasFragmentInfo { CanvasFragmentInfo { replaced_image_fragment_info: ReplacedImageFragmentInfo::new(node, - Some(Au::from_px(node.get_canvas_width() as int)), - Some(Au::from_px(node.get_canvas_height() as int))), + Some(Au::from_px(node.get_canvas_width() as isize)), + Some(Au::from_px(node.get_canvas_height() as isize))), renderer: node.get_renderer().map(|rec| Arc::new(Mutex::new(rec))), } } @@ -341,7 +341,7 @@ impl ImageFragmentInfo { /// Tile an image pub fn tile_image(position: &mut Au, size: &mut Au, virtual_position: Au, image_size: u32) { - let image_size = image_size as int; + let image_size = image_size as isize; let delta_pixels = geometry::to_px(virtual_position - *position); let tile_count = (delta_pixels + image_size - 1) / image_size; let offset = Au::from_px(image_size * tile_count);