Changeset 220112 in webkit

Timestamp:

Aug 1, 2017 2:42:28 PM (7 years ago)

Author:

Alan Bujtas

Message:

REGRESSION (r217197): New Yorker website hangs for a long time on load, lots of blank tiles
​https://bugs.webkit.org/show_bug.cgi?id=175009
<rdar://problem/33505791>

Reviewed by Simon Fraser.

Source/WebCore:

This patch ensures that we report the desktop, non-frame-flattened frame size for media queries in subframes.
Some websites don't expect the iframes to be expanded to the size of the content and when the media query
callback mutates the content (triggering frame resize), they might end up getting into a never ending layout.

Test: fast/frames/flattening/media-query-growing-content.html

• css/MediaQueryEvaluator.cpp:

(WebCore::orientationEvaluate):
(WebCore::aspectRatioEvaluate):
(WebCore::heightEvaluate):
(WebCore::widthEvaluate):

• page/FrameView.cpp:

(WebCore::FrameView::layout):
(WebCore::FrameView::layoutSizeForMediaQuery const):
(WebCore::FrameView::evaluateMediaQueryList):

• page/FrameView.h:

LayoutTests:

• fast/frames/flattening/media-query-growing-content-expected.txt: Added.
• fast/frames/flattening/media-query-growing-content.html: Added.
• fast/frames/flattening/resources/media-query-min-height-with-flattening.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/flattening/media-query-growing-content-expected.txt (added)
• LayoutTests/fast/frames/flattening/media-query-growing-content.html (added)
• LayoutTests/fast/frames/flattening/resources/media-query-min-height-with-flattening.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/MediaQueryEvaluator.cpp (modified) (4 diffs)
• Source/WebCore/page/FrameView.cpp (modified) (3 diffs)
• Source/WebCore/page/FrameView.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-08-01  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION (r217197): New Yorker website hangs for a long time on load, lots of blank tiles
+        https://bugs.webkit.org/show_bug.cgi?id=175009
+        <rdar://problem/33505791>
+
+        Reviewed by Simon Fraser.
+
+        * fast/frames/flattening/media-query-growing-content-expected.txt: Added.
+        * fast/frames/flattening/media-query-growing-content.html: Added.
+        * fast/frames/flattening/resources/media-query-min-height-with-flattening.html: Added.
+
 2017-08-01  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-01  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION (r217197): New Yorker website hangs for a long time on load, lots of blank tiles
+        https://bugs.webkit.org/show_bug.cgi?id=175009
+        <rdar://problem/33505791>
+
+        Reviewed by Simon Fraser.
+
+        This patch ensures that we report the desktop, non-frame-flattened frame size for media queries in subframes.
+        Some websites don't expect the iframes to be expanded to the size of the content and when the media query
+        callback mutates the content (triggering frame resize), they might end up getting into a never ending layout.
+
+        Test: fast/frames/flattening/media-query-growing-content.html
+
+        * css/MediaQueryEvaluator.cpp:
+        (WebCore::orientationEvaluate):
+        (WebCore::aspectRatioEvaluate):
+        (WebCore::heightEvaluate):
+        (WebCore::widthEvaluate):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::layoutSizeForMediaQuery const):
+        (WebCore::FrameView::evaluateMediaQueryList):
+        * page/FrameView.h:
+
 2017-07-26  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebCore/css/MediaQueryEvaluator.cpp

@@ -305 +305 @@
         return false;
 
-    auto width = view->layoutWidth();
-    auto height = view->layoutHeight();
-
+    auto viewSize = view->layoutSizeForMediaQuery();
     if (!is<CSSPrimitiveValue>(value)) {
         // Expression (orientation) evaluates to true if width and height >= 0.
-        return height >= 0 && width >= 0;
+        return viewSize.height() >= 0 && viewSize.width() >= 0;
     }
 
     auto keyword = downcast<CSSPrimitiveValue>(*value).valueID();
-    if (width > height) // Square viewport is portrait.
+    if (viewSize.width() > viewSize.height()) // Square viewport is portrait.
         return keyword == CSSValueLandscape;
     return keyword == CSSValuePortrait;
@@ -325 +323 @@
     if (!value)
         return true;
-
     FrameView* view = frame.view();
     if (!view)
         return true;
-
-    return compareAspectRatioValue(value, view->layoutWidth(), view->layoutHeight(), op);
+    auto viewSize = view->layoutSizeForMediaQuery();
+    return compareAspectRatioValue(value, viewSize.width(), viewSize.height(), op);
 }
 
@@ -446 +443 @@
     if (!view)
         return false;
-    int height = view->layoutHeight();
+    int height = view->layoutSizeForMediaQuery().height();
     if (!value)
         return height;
@@ -460 +457 @@
     if (!view)
         return false;
-    int width = view->layoutWidth();
+    int width = view->layoutSizeForMediaQuery().width();
     if (!value)
         return width;

trunk/Source/WebCore/page/FrameView.cpp

@@ -1317 +1317 @@
 
     if (inChildFrameLayoutWithFrameFlattening) {
+        if (!m_frameFlatteningViewSizeForMediaQuery)
+            m_frameFlatteningViewSizeForMediaQuery = ScrollView::layoutSize();
         startLayoutAtMainFrameViewIfNeeded(allowSubtree);
         RenderElement* root = m_layoutRoot ? m_layoutRoot : frame().document()->renderView();
@@ -1371 +1373 @@
             InspectorInstrumentation::mediaQueryResultChanged(document);
         }
-        
         document.evaluateMediaQueryList();
-
         // If there is any pagination to apply, it will affect the RenderView's style, so we should
         // take care of that now.
         applyPaginationToViewport();
-
         // Always ensure our style info is up-to-date. This can happen in situations where
         // the layout beats any sort of style recalc update that needs to occur.
@@ -5408 +5407 @@
     return renderView() && renderView()->shouldPlaceBlockDirectionScrollbarOnLeft();
 }
-    
+
+IntSize FrameView::layoutSizeForMediaQuery() const
+{
+    return m_frameFlatteningViewSizeForMediaQuery.value_or(ScrollView::layoutSize());
+}
+
 } // namespace WebCore

trunk/Source/WebCore/page/FrameView.h

@@ -217 +217 @@
 
     WEBCORE_EXPORT void adjustViewSize();
-    
+    IntSize layoutSizeForMediaQuery() const;
+
     WEBCORE_EXPORT void setViewportSizeForCSSViewportUnits(IntSize);
     IntSize viewportSizeForCSSViewportUnits() const;
@@ -891 +892 @@
     // The intrinsic content size decided by autosizing.
     IntSize m_autoSizeContentSize;
+    // Report the first computed frame view size to media queries.
+    std::optional<IntSize> m_frameFlatteningViewSizeForMediaQuery;
 
     std::unique_ptr<ScrollableAreaSet> m_scrollableAreas;