Changeset 146373 in webkit

Timestamp:

Mar 20, 2013 11:56:32 AM (11 years ago)

Author:

timothy_horton@apple.com

Message:

Autosize should use documentRect height instead of scrollHeight
​https://bugs.webkit.org/show_bug.cgi?id=112770

Reviewed by David Levin.

Autosizing fails to compute the correct height if the root element is very
small but the document has significant overflow.

No new tests; autosizing is not currently exposed in a testable way on Mac.

• page/FrameView.cpp:

(WebCore::FrameView::autoSizeIfEnabled):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-20  Tim Horton  <timothy_horton@apple.com>
+
+        Autosize should use documentRect height instead of scrollHeight
+        https://bugs.webkit.org/show_bug.cgi?id=112770
+
+        Reviewed by David Levin.
+
+        Autosizing fails to compute the correct height if the root element is very
+        small but the document has significant overflow.
+
+        No new tests; autosizing is not currently exposed in a testable way on Mac.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::autoSizeIfEnabled):
+
 2013-03-20  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2724 +2724 @@
         return;
 
-    RenderBox* documentRenderBox = documentElement->renderBox();
-    if (!documentRenderBox)
-        return;
-
     // If this is the first time we run autosize, start from small height and
     // allow it to grow.
@@ -2741 +2737 @@
         document->updateLayoutIgnorePendingStylesheets();
         int width = documentView->minPreferredLogicalWidth();
-        int height = documentRenderBox->scrollHeight();
+        int height = documentView->documentRect().height();
         IntSize newSize(width, height);