1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 98fa378..c3e2aa0 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -4660,9 +4660,14 @@ void RenderView::OnResize(const gfx::Size& new_size,
                           const gfx::Rect& resizer_rect) {
   if (webview()) {
     webview()->hidePopups();
+
     if (send_preferred_size_changes_) {
-      webview()->mainFrame()->setCanHaveScrollbars(
-          should_display_scrollbars(new_size.width(), new_size.height()));
+      // If resizing to a size larger than |disable_scrollbars_size_limit_| in
+      // either width or height, allow scroll bars.
+      bool allow_scrollbars = (
+          disable_scrollbars_size_limit_.width() <= new_size.width() ||
+          disable_scrollbars_size_limit_.height() <= new_size.height());
+      webview()->mainFrame()->setCanHaveScrollbars(allow_scrollbars);
     }
   }