Changeset 246920 in webkit

Timestamp:

Jun 27, 2019 8:22:29 PM (5 years ago)

Author:

Alan Bujtas

Message:

REGRESSION(r244633): e-mail with "height: 100%" causes unstable layout.
​https://bugs.webkit.org/show_bug.cgi?id=199303
<rdar://problem/51340927>

Reviewed by Tim Horton.

Source/WebCore:

This patch restores the previous behavior (pre r244633) where we intentionally reported stale content size value to
avoid unstable layout for content like height: 100px.

• page/FrameView.cpp:

(WebCore::FrameView::autoSizeIfEnabled):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm:

(TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-27  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION(r244633): e-mail with "height: 100%" causes unstable layout.
+        https://bugs.webkit.org/show_bug.cgi?id=199303
+        <rdar://problem/51340927>
+
+        Reviewed by Tim Horton.
+
+        This patch restores the previous behavior (pre r244633) where we intentionally reported stale content size value to
+        avoid unstable layout for content like height: 100px.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::autoSizeIfEnabled):
+
 2019-06-27  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -3469 +3469 @@
     document->updateStyleIfNeeded();
     document->updateLayoutIgnorePendingStylesheets();
-
-    auto currentContentsSize = this->contentsSize();
-    auto finalWidth = std::max(m_autoSizeConstraint.width(), currentContentsSize.width());
-    auto finalHeight = m_autoSizeFixedMinimumHeight ? std::max(m_autoSizeFixedMinimumHeight, currentContentsSize.height()) : currentContentsSize.height();
+    // While the final content size could slightly be different after the next resize/layout (see below), we intentionally save and report 
+    // the current value to avoid unstable layout (e.g. content "height: 100%").
+    // See also webkit.org/b/173561
+    m_autoSizeContentSize = contentsSize();
+
+    auto finalWidth = std::max(m_autoSizeConstraint.width(), m_autoSizeContentSize.width());
+    auto finalHeight = m_autoSizeFixedMinimumHeight ? std::max(m_autoSizeFixedMinimumHeight, m_autoSizeContentSize.height()) : m_autoSizeContentSize.height();
     resize(finalWidth, finalHeight);
     document->updateLayoutIgnorePendingStylesheets();
-    m_autoSizeContentSize = contentsSize(); 
     if (auto* page = frame().page())
         page->chrome().client().intrinsicContentsSizeChanged(m_autoSizeContentSize);

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-27  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION(r244633): e-mail with "height: 100%" causes unstable layout.
+        https://bugs.webkit.org/show_bug.cgi?id=199303
+        <rdar://problem/51340927>
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm:
+        (TEST):
+
 2019-06-27  Beth Dakin  <bdakin@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm

@@ -164 +164 @@
     // the intrinsic size change callback.
     [webView _setShouldExpandContentToViewHeightForAutoLayout:YES];
-    [webView load:@"<div class='large'></div>" withWidth:50 expectingContentSize:NSMakeSize(100, 1000) resettingWidth:NO];
+    // 100px _is_the_expected_ height because we intentionally report stale value to avoid unstable layout.
+    // See FrameView::autoSizeIfEnabled().
+    [webView load:@"<div class='large'></div>" withWidth:50 expectingContentSize:NSMakeSize(100, 100) resettingWidth:NO];
     [webView evaluateJavaScript:@"window.innerHeight" completionHandler:^(id value, NSError *error) {
         EXPECT_TRUE([value isKindOfClass:[NSNumber class]]);