Add grid/flex layout support for <fieldset>

third_party/WebKit/Source/core/layout/LayoutFieldset.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 16 matching lines @@
 #include "core/HTMLNames.h"
 #include "core/html/HTMLLegendElement.h"
 #include "core/paint/FieldsetPainter.h"
 
 using namespace std;
 
 namespace blink {
 
 using namespace HTMLNames;
 
+namespace {
+
+void setInnerBlockPadding(bool isHorizontalWritingMode, const LayoutObject* innerBlock, const LayoutUnit& padding)

[Manuel Rego, 2016/07/22 06:16:07]

Why you need "namespace {" here?
Couldn't be enough with just using a static method?

[cbiesinger, 2016/07/22 22:03:30]

Style guide prefers anonymous namespace over static methods:
https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md...

+{
+    if (isHorizontalWritingMode)
+        innerBlock->mutableStyleRef().setPaddingTop(Length(padding, Fixed));
+    else
+        innerBlock->mutableStyleRef().setPaddingLeft(Length(padding, Fixed));
+}
+
+void resetInnerBlockPadding(bool isHorizontalWritingMode, const LayoutObject* innerBlock)
+{
+    if (isHorizontalWritingMode)
+        innerBlock->mutableStyleRef().setPaddingTop(Length(0, Fixed));
+    else
+        innerBlock->mutableStyleRef().setPaddingLeft(Length(0, Fixed));
+}
+
+} // namespace
+
 LayoutFieldset::LayoutFieldset(Element* element)
-    : LayoutBlockFlow(element)
+    : LayoutFlexibleBox(element), m_innerBlock(nullptr)
 {
 }
 
-void LayoutFieldset::computePreferredLogicalWidths()
+int LayoutFieldset::baselinePosition(FontBaseline baseline, bool firstLine, LineDirectionMode direction, LinePositionMode position) const
 {
-    LayoutBlockFlow::computePreferredLogicalWidths();
+    return LayoutBlock::baselinePosition(baseline, firstLine, direction, position);
+}
+
+void LayoutFieldset::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
+{
+    if (m_innerBlock)
+        computeChildPreferredLogicalWidths(*m_innerBlock, minLogicalWidth, maxLogicalWidth);
+
     if (LayoutBox* legend = findInFlowLegend()) {
-        int legendMinWidth = legend->minPreferredLogicalWidth();
+        LayoutUnit minPreferredLegendLogicalWidth;
+        LayoutUnit maxPreferredLegendLogicalWidth;
+        computeChildPreferredLogicalWidths(*legend, minPreferredLegendLogicalWidth, maxPreferredLegendLogicalWidth);
+        LayoutUnit margin = marginIntrinsicLogicalWidthForChild(*legend);
+        minPreferredLegendLogicalWidth += margin;
+        maxPreferredLegendLogicalWidth += margin;
+        minLogicalWidth = std::max(minLogicalWidth, minPreferredLegendLogicalWidth);
+        maxLogicalWidth = std::max(maxLogicalWidth, maxPreferredLegendLogicalWidth);
+    }
+    maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
 
-        Length legendMarginLeft = legend->style()->marginLeft();
-        Length legendMarginRight = legend->style()->marginRight();
+    // Due to negative margins, it is possible that we calculated a negative intrinsic width. Make sure that we
+    // never return a negative width.
+    minLogicalWidth = std::max(LayoutUnit(), minLogicalWidth);
+    maxLogicalWidth = std::max(LayoutUnit(), maxLogicalWidth);
 
-        if (legendMarginLeft.isFixed())
-            legendMinWidth += legendMarginLeft.value();
+    LayoutUnit scrollbarWidth(scrollbarLogicalWidth());
+    maxLogicalWidth += scrollbarWidth;
+    minLogicalWidth += scrollbarWidth;
+}
 
-        if (legendMarginRight.isFixed())
-            legendMinWidth += legendMarginRight.value();
-
-        m_minPreferredLogicalWidth = max(m_minPreferredLogicalWidth, legendMinWidth + borderAndPaddingWidth());
+void LayoutFieldset::setLogicalLeftForChild(LayoutBox& child, LayoutUnit logicalLeft)
+{
+    if (isHorizontalWritingMode()) {
+        child.setX(logicalLeft);
+    } else {
+        child.setY(logicalLeft);
     }
 }
 
+void LayoutFieldset::setLogicalTopForChild(LayoutBox& child, LayoutUnit logicalTop)
+{
+    if (isHorizontalWritingMode()) {
+        child.setY(logicalTop);
+    } else {
+        child.setX(logicalTop);
+    }
+}
+
 LayoutObject* LayoutFieldset::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope&)
 {
     LayoutBox* legend = findInFlowLegend();
     if (legend) {
         LayoutRect oldLegendFrameRect = legend->frameRect();
 
         if (relayoutChildren)
             legend->setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::FieldsetChanged);
         legend->layoutIfNeeded();
 
@@ skipping 28 matching lines @@
             }
         }
 
         setLogicalLeftForChild(*legend, logicalLeft);
 
         LayoutUnit fieldsetBorderBefore = LayoutUnit(borderBefore());
         LayoutUnit legendLogicalHeight = logicalHeightForChild(*legend);
 
         LayoutUnit legendLogicalTop;
         LayoutUnit collapsedLegendExtent;
+        LayoutUnit innerBlockPadding;
         // FIXME: We need to account for the legend's margin before too.
         if (fieldsetBorderBefore > legendLogicalHeight) {
             // The <legend> is smaller than the associated fieldset before border
             // so the latter determines positioning of the <legend>. The sizing depends
             // on the legend's margins as we want to still follow the author's cues.
             // Firefox completely ignores the margins in this case which seems wrong.
             legendLogicalTop = (fieldsetBorderBefore - legendLogicalHeight) / 2;
             collapsedLegendExtent = max<LayoutUnit>(fieldsetBorderBefore, legendLogicalTop + legendLogicalHeight + marginAfterForChild(*legend));
+            innerBlockPadding = marginAfterForChild(*legend) ? marginAfterForChild(*legend) - legendLogicalTop : LayoutUnit();
         } else {
             collapsedLegendExtent = legendLogicalHeight + marginAfterForChild(*legend);
+            innerBlockPadding = legendLogicalHeight - borderAfter() + marginAfterForChild(*legend);
         }
 
+        setInnerBlockPadding(isHorizontalWritingMode(), m_innerBlock, innerBlockPadding);
         setLogicalTopForChild(*legend, legendLogicalTop);
         setLogicalHeight(paddingBefore() + collapsedLegendExtent);
 
         if (legend->frameRect() != oldLegendFrameRect) {
             // We need to invalidate the fieldset border if the legend's frame changed.
             setShouldDoFullPaintInvalidation();
         }
     }
     return legend;
 }
@@ skipping 15 matching lines @@
 void LayoutFieldset::paintBoxDecorationBackground(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
     FieldsetPainter(*this).paintBoxDecorationBackground(paintInfo, paintOffset);
 }
 
 void LayoutFieldset::paintMask(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
     FieldsetPainter(*this).paintMask(paintInfo, paintOffset);
 }
 
+void LayoutFieldset::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
+{
+    LayoutFlexibleBox::styleDidChange(diff, oldStyle);
+    adjustInnerStyle();
+}
+
+void LayoutFieldset::addChild(LayoutObject* newChild, LayoutObject* beforeChild)
+{
+    if (!m_innerBlock)
+        createInnerBlock();
+
+    if (isHTMLLegendElement(newChild->node())) {
+        LayoutFlexibleBox::addChild(newChild);
+    } else {
+        m_innerBlock->addChild(newChild, beforeChild);
+        DCHECK(m_innerBlock == firstChild());
+    }
+}
+
+void LayoutFieldset::adjustInnerStyle()
+{
+    if (!m_innerBlock)
+        createInnerBlock();
+
+    ComputedStyle& innerStyle = m_innerBlock->mutableStyleRef();
+    innerStyle.setFlexShrink(1.0f);
+    innerStyle.setFlexGrow(1.0f);
+    // min-width: 0; is needed for correct shrinking.
+    innerStyle.setMinWidth(Length(0, Fixed));
+    innerStyle.setFlexDirection(style()->flexDirection());
+    innerStyle.setJustifyContent(style()->justifyContent());
+    innerStyle.setFlexWrap(style()->flexWrap());
+    innerStyle.setAlignItems(style()->alignItems());
+    innerStyle.setAlignContent(style()->alignContent());
+}
+
+void LayoutFieldset::createInnerBlock()
+{
+    if (m_innerBlock) {
+        DCHECK(firstChild() == m_innerBlock);
+        return;
+    }
+    m_innerBlock = createAnonymousBlock(style()->display());
+    LayoutFlexibleBox::addChild(m_innerBlock);
+}
+
+void LayoutFieldset::removeChild(LayoutObject* oldChild)
+{
+    if (isHTMLLegendElement(oldChild->node())) {
+        LayoutFlexibleBox::removeChild(oldChild);
+        if (m_innerBlock)
+            resetInnerBlockPadding(isHorizontalWritingMode(), m_innerBlock);
+    } else if (oldChild == m_innerBlock) {
+        LayoutFlexibleBox::removeChild(oldChild);
+        m_innerBlock = nullptr;
+    } else if (m_innerBlock) {
+        m_innerBlock->removeChild(oldChild);
+    }
+}
+
 } // namespace blink