<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[238668] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/238668">238668</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2018-11-29 07:30:27 -0800 (Thu, 29 Nov 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutblockformattingBlockFormattingContexth">trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h</a></li>
<li><a href="#trunkSourceWebCorelayoutblockformattingBlockFormattingContextGeometrycpp">trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutblockformattingBlockFormattingContextQuirkscpp">trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (238667 => 238668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-11-29 15:28:20 UTC (rev 238667)
+++ trunk/Source/WebCore/ChangeLog      2018-11-29 15:30:27 UTC (rev 238668)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2018-11-29  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [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>
+
</ins><span class="cx">         [LFC][Quirk] Move quirk functions to dedicated classes.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=192133
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutblockformattingBlockFormattingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h (238667 => 238668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h     2018-11-29 15:28:20 UTC (rev 238667)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h        2018-11-29 15:30:27 UTC (rev 238668)
</span><span class="lines">@@ -112,9 +112,9 @@
</span><span class="cx"> 
</span><span class="cx">     class Quirks {
</span><span class="cx">     public:
</span><del>-        static bool isStretchedToInitialContainingBlock(const LayoutState&, const Box&);
</del><ins>+        static bool needsStretching(const LayoutState&, const Box&);
</ins><span class="cx">         static HeightAndMargin stretchedHeight(const LayoutState&, const Box&, HeightAndMargin);
</span><del>-        static WidthAndMargin stretchedWidth(const LayoutState&, const Box&, WidthAndMargin);
</del><ins>+
</ins><span class="cx">         static bool shouldIgnoreMarginTop(const LayoutState&, const Box&);
</span><span class="cx">     };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutblockformattingBlockFormattingContextGeometrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp (238667 => 238668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp   2018-11-29 15:28:20 UTC (rev 238667)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp      2018-11-29 15:30:27 UTC (rev 238668)
</span><span class="lines">@@ -195,14 +195,7 @@
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     auto widthAndMargin = compute();
</span><del>-    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 << ")");
</del><ins>+    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 << ")");
</ins><span class="cx">     return widthAndMargin;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -264,7 +257,7 @@
</span><span class="cx">         heightAndMargin = complicatedCases(layoutState, layoutBox, usedHeight);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (!Quirks::isStretchedToInitialContainingBlock(layoutState, layoutBox))
</del><ins>+    if (!Quirks::needsStretching(layoutState, layoutBox))
</ins><span class="cx">         return heightAndMargin;
</span><span class="cx"> 
</span><span class="cx">     heightAndMargin = Quirks::stretchedHeight(layoutState, layoutBox, heightAndMargin);
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutblockformattingBlockFormattingContextQuirkscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp (238667 => 238668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp     2018-11-29 15:28:20 UTC (rev 238667)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp        2018-11-29 15:30:27 UTC (rev 238668)
</span><span class="lines">@@ -53,10 +53,10 @@
</span><span class="cx">     return layoutBox.style().hasMarginBeforeQuirk();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool BlockFormattingContext::Quirks::isStretchedToInitialContainingBlock(const LayoutState& layoutState, const Box& layoutBox)
</del><ins>+bool BlockFormattingContext::Quirks::needsStretching(const LayoutState& layoutState, const Box& layoutBox)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(layoutBox.isInFlow());
</span><del>-    // In quirks mode, body and html stretch to the viewport.
</del><ins>+    // In quirks mode, body stretches to html and html to the initial containing block (height: auto only).
</ins><span class="cx">     if (!layoutState.inQuirksMode())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="lines">@@ -81,17 +81,6 @@
</span><span class="cx">     return heightAndMargin;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-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;
-}
-
</del><span class="cx"> bool BlockFormattingContext::Quirks::shouldIgnoreMarginTop(const LayoutState& layoutState, const Box& layoutBox)
</span><span class="cx"> {
</span><span class="cx">     if (!layoutBox.parent())
</span></span></pre>
</div>
</div>

</body>
</html>