Changeset 264960 in webkit

Timestamp:

Jul 27, 2020 5:30:17 PM (4 years ago)

Author:

Alan Bujtas

Message:

Extension is sized incorrectly, content is cut off.
​https://bugs.webkit.org/show_bug.cgi?id=214858
<rdar://problem/64135680>

Reviewed by Simon Fraser.

Source/WebCore:

Autosizing uses an 1px tall viewport to layout the content initially. When the document renderer's height is set to a percent value, this
1px tall viewport will drive the available height for the descendants and we pretty much end up with overflow content.
Autosizing takes the overflow into account when computing the final content size, however this overflow depends on the type of the layout context (e.g. flex vs. block).

Let's replace percent height values on the document renderer with the initial "height: auto".

Test: fast/dynamic/size-to-content-autosize-with-percent-document-height.html

• page/FrameView.cpp:

(WebCore::FrameView::performSizeToContentAutoSize):

LayoutTests:

• fast/dynamic/size-to-content-autosize-with-percent-document-height-expected.html: Added.
• fast/dynamic/size-to-content-autosize-with-percent-document-height.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dynamic/size-to-content-autosize-with-percent-document-height-expected.html (added)
• LayoutTests/fast/dynamic/size-to-content-autosize-with-percent-document-height.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-07-27  Zalan Bujtas  <zalan@apple.com>
+
+        Extension is sized incorrectly, content is cut off.
+        https://bugs.webkit.org/show_bug.cgi?id=214858
+        <rdar://problem/64135680>
+
+        Reviewed by Simon Fraser.
+
+        * fast/dynamic/size-to-content-autosize-with-percent-document-height-expected.html: Added.
+        * fast/dynamic/size-to-content-autosize-with-percent-document-height.html: Added.
+
 2020-07-27  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-27  Zalan Bujtas  <zalan@apple.com>
+
+        Extension is sized incorrectly, content is cut off.
+        https://bugs.webkit.org/show_bug.cgi?id=214858
+        <rdar://problem/64135680>
+
+        Reviewed by Simon Fraser.
+
+        Autosizing uses an 1px tall viewport to layout the content initially. When the document renderer's height is set to a percent value, this
+        1px tall viewport will drive the available height for the descendants and we pretty much end up with overflow content.
+        Autosizing takes the overflow into account when computing the final content size, however this overflow depends on the type of the layout context (e.g. flex vs. block).
+
+        Let's replace percent height values on the document renderer with the initial "height: auto".
+
+        Test: fast/dynamic/size-to-content-autosize-with-percent-document-height.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::performSizeToContentAutoSize):
+
 2020-07-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -3488 +3488 @@
 void FrameView::performSizeToContentAutoSize()
 {
+    // Do the resizing twice. The first time is basically a rough calculation using the preferred width
+    // which may result in a height change during the second iteration.
+    // Let's ignore renderers with viewport units first and resolve these boxes during the second phase of the autosizing.
     LOG(Layout, "FrameView %p performSizeToContentAutoSize", this);
-
-    auto* document = frame().document();
-    auto* renderView = document->renderView();
-
+    ASSERT(frame().document() && frame().document()->renderView());
+
+    auto& document = *frame().document();
+    auto& renderView = *document.renderView();
+    auto layoutWithAdjustedStyleIfNeeded = [&] {
+        document.updateStyleIfNeeded();
+        if (auto* documentRenderer = downcast<RenderElement>(renderView.firstChild())) {
+            auto& style = documentRenderer->mutableStyle();
+            if (style.logicalHeight().isPercent()) {
+                // Percent height values on the document renderer when we don't really have a proper viewport size can
+                // result incorrect rendering in certain layout contexts (e.g flex).
+                style.setLogicalHeight({ });
+            }
+        }
+        document.updateLayout();
+    };
+
+    resetOverriddenViewportWidthForCSSViewportUnits();
     // Start from the minimum size and allow it to grow.
     auto minAutoSize = IntSize { 1, 1 };
     resize(minAutoSize);
     auto size = frameRect().size();
-    // Do the resizing twice. The first time is basically a rough calculation using the preferred width
-    // which may result in a height change during the second iteration.
-    // Let's ignore renderers with viewport units first and resolve these boxes during the second phase of the autosizing.
-    resetOverriddenViewportWidthForCSSViewportUnits();
     for (int i = 0; i < 2; i++) {
+        layoutWithAdjustedStyleIfNeeded();
         // Update various sizes including contentsSize, scrollHeight, etc.
-        document->updateLayoutIgnorePendingStylesheets();
-        auto newSize = IntSize { renderView->minPreferredLogicalWidth(), renderView->documentRect().height() };
+        auto newSize = IntSize { renderView.minPreferredLogicalWidth(), renderView.documentRect().height() };
 
         // Check to see if a scrollbar is needed for a given dimension and
@@ -3564 +3577 @@
     }
     // All the resizing above may have invalidated style (for example if viewport units are being used).
-    document->updateStyleIfNeeded();
     // FIXME: Use the final layout's result as the content size (webkit.org/b/173561).
-    document->updateLayoutIgnorePendingStylesheets();
+    layoutWithAdjustedStyleIfNeeded();
     m_autoSizeContentSize = contentsSize();
 }