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/float_context.rs | |
| parent | ffe60ea02704c0bd4545a194bff3f2feafd0133c (diff) | |
| download | servo-be061a9aa0384fc36b42f4f8902b6c8cb76d30cc.tar.gz servo-be061a9aa0384fc36b42f4f8902b6c8cb76d30cc.zip | |
Library changes
Diffstat (limited to 'src/components/main/layout/float_context.rs')
| -rw-r--r-- | src/components/main/layout/float_context.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/main/layout/float_context.rs b/src/components/main/layout/float_context.rs index 60bb9595615..c24277465cc 100644 --- a/src/components/main/layout/float_context.rs +++ b/src/components/main/layout/float_context.rs @@ -300,7 +300,7 @@ impl FloatContextBase{ f_data.bounds.origin.x + f_data.bounds.size.width > left && f_data.bounds.origin.x < left + width { let new_y = f_data.bounds.origin.y; - max_height = Some(min(max_height.get_or_default(new_y), new_y)); + max_height = Some(min(max_height.unwrap_or_default(new_y), new_y)); } } } @@ -340,7 +340,7 @@ impl FloatContextBase{ let height = self.max_height_for_bounds(rect.origin.x, rect.origin.y, rect.size.width); - let height = height.get_or_default(Au(max_value)); + let height = height.unwrap_or_default(Au(max_value)); return match info.f_type { FloatLeft => Rect(Point2D(rect.origin.x, float_y), Size2D(rect.size.width, height)), |