Changeset 238668 in webkit

Timestamp:

Nov 29, 2018, 7:30:27 AM (8 years ago)

Author:

Alan Bujtas

Message:

[LFC][BFC][Quirk] Width does not need stretching quirk.
​https://bugs.webkit.org/show_bug.cgi?id=192135

Reviewed by Antti Koivisto.

In BFC the block box's width (auto) always streches to the content width of the containing block.

• layout/blockformatting/BlockFormattingContext.h:
• layout/blockformatting/BlockFormattingContextGeometry.cpp:

(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowHeightAndMargin):

• layout/blockformatting/BlockFormattingContextQuirks.cpp:

(WebCore::Layout::BlockFormattingContext::Quirks::needsStretching):
(WebCore::Layout::BlockFormattingContext::Quirks::isStretchedToInitialContainingBlock): Deleted.
(WebCore::Layout::BlockFormattingContext::Quirks::stretchedWidth): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/blockformatting/BlockFormattingContext.h (modified) (1 diff)
• layout/blockformatting/BlockFormattingContextGeometry.cpp (modified) (2 diffs)
• layout/blockformatting/BlockFormattingContextQuirks.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-29  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][BFC][Quirk] Width does not need stretching quirk.
+        https://bugs.webkit.org/show_bug.cgi?id=192135
+
+        Reviewed by Antti Koivisto.
+
+        In BFC the block box's width (auto) always streches to the content width of the containing block.
+
+        * layout/blockformatting/BlockFormattingContext.h:
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin):
+        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowHeightAndMargin):
+        * layout/blockformatting/BlockFormattingContextQuirks.cpp:
+        (WebCore::Layout::BlockFormattingContext::Quirks::needsStretching):
+        (WebCore::Layout::BlockFormattingContext::Quirks::isStretchedToInitialContainingBlock): Deleted.
+        (WebCore::Layout::BlockFormattingContext::Quirks::stretchedWidth): Deleted.
+
 2018-11-29  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h

@@ -113 +113 @@
     class Quirks {
     public:
-        static bool isStretchedToInitialContainingBlock(const LayoutState&, const Box&);
+        static bool needsStretching(const LayoutState&, const Box&);
         static HeightAndMargin stretchedHeight(const LayoutState&, const Box&, HeightAndMargin);
-        static WidthAndMargin stretchedWidth(const LayoutState&, const Box&, WidthAndMargin);
+
         static bool shouldIgnoreMarginTop(const LayoutState&, const Box&);
     };

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp

@@ -196 +196 @@
 
     auto widthAndMargin = compute();
-    if (!Quirks::isStretchedToInitialContainingBlock(layoutState, layoutBox)) {
-        LOG_WITH_STREAM(FormattingContextLayout, stream << "[Width][Margin] -> inflow non-replaced -> width(" << widthAndMargin.width << "px) margin(" << widthAndMargin.margin.left << "px, " << widthAndMargin.margin.right << "px) -> layoutBox(" << &layoutBox << ")");
-        return widthAndMargin;
-    }
-
-    widthAndMargin = Quirks::stretchedWidth(layoutState, layoutBox, widthAndMargin);
-
-    LOG_WITH_STREAM(FormattingContextLayout, stream << "[Width][Margin] -> inflow non-replaced -> streched to viewport-> width(" << widthAndMargin.width << "px) margin(" << widthAndMargin.margin.left << "px, " << widthAndMargin.margin.right << "px) -> layoutBox(" << &layoutBox << ")");
+    LOG_WITH_STREAM(FormattingContextLayout, stream << "[Width][Margin] -> inflow non-replaced -> width(" << widthAndMargin.width << "px) margin(" << widthAndMargin.margin.left << "px, " << widthAndMargin.margin.right << "px) -> layoutBox(" << &layoutBox << ")");
     return widthAndMargin;
 }
@@ -265 +258 @@
     }
 
-    if (!Quirks::isStretchedToInitialContainingBlock(layoutState, layoutBox))
+    if (!Quirks::needsStretching(layoutState, layoutBox))
         return heightAndMargin;
 

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp

@@ -54 +54 @@
 }
 
-bool BlockFormattingContext::Quirks::isStretchedToInitialContainingBlock(const LayoutState& layoutState, const Box& layoutBox)
+bool BlockFormattingContext::Quirks::needsStretching(const LayoutState& layoutState, const Box& layoutBox)
 {
     ASSERT(layoutBox.isInFlow());
-    // In quirks mode, body and html stretch to the viewport.
+    // In quirks mode, body stretches to html and html to the initial containing block (height: auto only).
     if (!layoutState.inQuirksMode())
         return false;
@@ -82 +82 @@
 }
 
-WidthAndMargin BlockFormattingContext::Quirks::stretchedWidth(const LayoutState& layoutState, const Box& layoutBox, WidthAndMargin widthAndMargin)
-{
-    auto initialContainingBlockWidth = layoutState.displayBoxForLayoutBox(initialContainingBlock(layoutBox)).contentBoxWidth();
-    auto horizontalMargins = widthAndMargin.margin.left + widthAndMargin.margin.right;
-    // Stretch but never overstretch with the margins.
-    if (widthAndMargin.width + horizontalMargins < initialContainingBlockWidth)
-        widthAndMargin.width = initialContainingBlockWidth - horizontalMargins;
-
-    return widthAndMargin;
-}
-
 bool BlockFormattingContext::Quirks::shouldIgnoreMarginTop(const LayoutState& layoutState, const Box& layoutBox)
 {