diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-05 10:58:50 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-05 10:58:50 +0530 |
| commit | fb3fe3d784c24cdfd8040af0282e5c2182ee2051 (patch) | |
| tree | 5c9526e286505884288f3ed2fa5353bdbe8c9b85 /components/layout/layout_thread.rs | |
| parent | b3bbea8be81f949e2af6e31cf67bcaaaeb8bd84b (diff) | |
| parent | 7c5b2d6cb3ee4f934e529162be368c36a7f590a4 (diff) | |
| download | servo-fb3fe3d784c24cdfd8040af0282e5c2182ee2051.tar.gz servo-fb3fe3d784c24cdfd8040af0282e5c2182ee2051.zip | |
Auto merge of #9522 - pcwalton:two-overflows, r=mbrubeck
layout: Separate out overflow-for-scrolling from overflow-for-paint.
Closes #9484.
r? @mbrubeck
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9522)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/layout_thread.rs')
| -rw-r--r-- | components/layout/layout_thread.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs index 8599b89cc2d..70c7be552e7 100644 --- a/components/layout/layout_thread.rs +++ b/components/layout/layout_thread.rs @@ -865,7 +865,7 @@ impl LayoutThread { if rw_data.stylist.viewport_constraints().is_some() { root_flow.position.size.to_physical(root_flow.writing_mode) } else { - root_flow.overflow.size + root_flow.overflow.scroll.size } }; let mut display_list = box DisplayList::new(); |