| Index: views/controls/scroll_view.cc
|
| diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc
|
| index a5b5f6a67cc3a72008278b5bf1e0a0848579e6e5..84ce6c7ac32f9b4b2924e991e153da0cec76d502 100644
|
| --- a/views/controls/scroll_view.cc
|
| +++ b/views/controls/scroll_view.cc
|
| @@ -190,7 +190,8 @@ void ScrollView::Layout() {
|
|
|
| // Non-default.
|
| if (horiz_sb_required) {
|
| - viewport_bounds.set_height(viewport_bounds.height() - horiz_sb_height);
|
| + viewport_bounds.set_height(
|
| + std::max(0, viewport_bounds.height() - horiz_sb_height));
|
| should_layout_contents = true;
|
| }
|
| // Default.
|
|
|