1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/third_party/blink/renderer/core/frame/frame_view_auto_size_info.cc b/chromium/third_party/blink/renderer/core/frame/frame_view_auto_size_info.cc
index cac4c748fcf..fbb4717268b 100644
--- a/chromium/third_party/blink/renderer/core/frame/frame_view_auto_size_info.cc
+++ b/chromium/third_party/blink/renderer/core/frame/frame_view_auto_size_info.cc
@@ -90,7 +90,10 @@ void FrameViewAutoSizeInfo::AutoSizeIfNeeded() {
                              kHorizontalScrollbar));
       // Don't bother checking for a vertical scrollbar because the width is at
       // already greater the maximum.
-    } else if (new_size.Height() > max_auto_size_.Height()) {
+    } else if (new_size.Height() > max_auto_size_.Height() &&
+               // If we have a real vertical scrollbar, it's already included in
+               // MinPreferredLogicalWidth, so don't add a hypothetical one.
+               !layout_viewport->HasVerticalScrollbar()) {
       new_size.Expand(
           layout_viewport->HypotheticalScrollbarThickness(kVerticalScrollbar),
           0);