diff options
| author | Keegan McAllister <kmcallister@mozilla.com> | 2013-08-09 13:24:10 -0700 |
|---|---|---|
| committer | Keegan McAllister <kmcallister@mozilla.com> | 2013-08-15 13:55:40 -0700 |
| commit | be061a9aa0384fc36b42f4f8902b6c8cb76d30cc (patch) | |
| tree | 4ede58c0b6442422f720684686cd4715dc143d2c /src/components/main/layout/box.rs | |
| parent | ffe60ea02704c0bd4545a194bff3f2feafd0133c (diff) | |
| download | servo-be061a9aa0384fc36b42f4f8902b6c8cb76d30cc.tar.gz servo-be061a9aa0384fc36b42f4f8902b6c8cb76d30cc.zip | |
Library changes
Diffstat (limited to 'src/components/main/layout/box.rs')
| -rw-r--r-- | src/components/main/layout/box.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/main/layout/box.rs b/src/components/main/layout/box.rs index 38f422a1dff..658b52726c8 100644 --- a/src/components/main/layout/box.rs +++ b/src/components/main/layout/box.rs @@ -38,7 +38,7 @@ use script::dom::node::{AbstractNode, LayoutView}; use servo_net::image::holder::ImageHolder; use servo_net::local_image_cache::LocalImageCache; use servo_util::range::*; -use extra::net::url::Url; +use extra::url::Url; /// Render boxes (`struct RenderBox`) are the leaves of the layout tree. They cannot position /// themselves. In general, render boxes do not have a simple correspondence with CSS boxes as in @@ -433,7 +433,7 @@ impl RenderBox { ImageRenderBoxClass(image_box) => { // TODO: Consult the CSS `width` property as well as margins and borders. // TODO: If the image isn't available, consult `width`. - Au::from_px(image_box.image.get_size().get_or_default(Size2D(0, 0)).width) + Au::from_px(image_box.image.get_size().unwrap_or_default(Size2D(0, 0)).width) } TextRenderBoxClass(text_box) => { @@ -454,7 +454,7 @@ impl RenderBox { GenericRenderBoxClass(*) => Au(0), ImageRenderBoxClass(image_box) => { - Au::from_px(image_box.image.get_size().get_or_default(Size2D(0, 0)).width) + Au::from_px(image_box.image.get_size().unwrap_or_default(Size2D(0, 0)).width) } TextRenderBoxClass(text_box) => { |