⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 268974 in webkit


Ignore:
Timestamp:
Oct 26, 2020, 6:32:24 AM (6 years ago)
Author:
Alan Bujtas
Message:

[LFC] Rename functions with ContentWidth/HeightAndMargin return type
​https://bugs.webkit.org/show_bug.cgi?id=218165

Reviewed by Antti Koivisto.

E.g. inlineBlockWidthAndMargin does not indicate whether it computes border, padding or content box width.
Let's rename Geometry::*WidthAndMargin and Geometry::*HeightAndMargin to Geometry::*ContentWidthAndMargin and Geometry::*ContentHeightAndMargin.

  • layout/FormattingContext.h:
  • layout/FormattingContextGeometry.cpp:

(WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry const):
(WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedHorizontalGeometry):
(WebCore::Layout::FormattingContext::Geometry::floatingNonReplacedContentWidthAndMargin):
(WebCore::Layout::FormattingContext::Geometry::floatingReplacedContentHeightAndMargin const):
(WebCore::Layout::FormattingContext::Geometry::floatingReplacedContentWidthAndMargin):
(WebCore::Layout::FormattingContext::Geometry::floatingContentHeightAndMargin const):
(WebCore::Layout::FormattingContext::Geometry::floatingContentWidthAndMargin):
(WebCore::Layout::FormattingContext::Geometry::inlineReplacedContentHeightAndMargin const):
(WebCore::Layout::FormattingContext::Geometry::inlineReplacedContentWidthAndMargin):
(WebCore::Layout::FormattingContext::Geometry::floatingNonReplacedWidthAndMargin): Deleted.
(WebCore::Layout::FormattingContext::Geometry::floatingReplacedHeightAndMargin const): Deleted.
(WebCore::Layout::FormattingContext::Geometry::floatingReplacedWidthAndMargin): Deleted.
(WebCore::Layout::FormattingContext::Geometry::floatingHeightAndMargin const): Deleted.
(WebCore::Layout::FormattingContext::Geometry::floatingWidthAndMargin): Deleted.
(WebCore::Layout::FormattingContext::Geometry::inlineReplacedHeightAndMargin const): Deleted.
(WebCore::Layout::FormattingContext::Geometry::inlineReplacedWidthAndMargin): Deleted.

  • layout/blockformatting/BlockFormattingContext.cpp:

(WebCore::Layout::BlockFormattingContext::computeWidthAndMargin):
(WebCore::Layout::BlockFormattingContext::computeHeightAndMargin):

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

(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedContentHeightAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedContentWidthAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowReplacedContentWidthAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowContentHeightAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowContentWidthAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::computedContentWidthAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin): Deleted.
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin): Deleted.
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowReplacedWidthAndMargin): Deleted.
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowHeightAndMargin): Deleted.
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowWidthAndMargin): Deleted.
(WebCore::Layout::BlockFormattingContext::Geometry::computedWidthAndMargin): Deleted.

  • layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp:

(WebCore::Layout::TableWrapperBlockFormattingContext::computeWidthAndMarginForTableBox):
(WebCore::Layout::TableWrapperBlockFormattingContext::computeHeightAndMarginForTableBox):

  • layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::computeWidthAndMargin):
(WebCore::Layout::InlineFormattingContext::computeHeightAndMargin):

  • layout/inlineformatting/InlineFormattingContext.h:
  • layout/inlineformatting/InlineFormattingContextGeometry.cpp:

(WebCore::Layout::InlineFormattingContext::Geometry::inlineBlockContentWidthAndMargin):
(WebCore::Layout::InlineFormattingContext::Geometry::inlineBlockContentHeightAndMargin const):
(WebCore::Layout::InlineFormattingContext::Geometry::inlineBlockWidthAndMargin): Deleted.
(WebCore::Layout::InlineFormattingContext::Geometry::inlineBlockHeightAndMargin const): Deleted.

Location:
trunk/Source/WebCore
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r268971 r268974  
     12020-10-26  Zalan Bujtas  <zalan@apple.com>
     2
     3        [LFC] Rename functions with ContentWidth/HeightAndMargin return type
     4        https://bugs.webkit.org/show_bug.cgi?id=218165
     5
     6        Reviewed by Antti Koivisto.
     7
     8        E.g. inlineBlockWidthAndMargin does not indicate whether it computes border, padding or content box width.
     9        Let's rename Geometry::*WidthAndMargin and Geometry::*HeightAndMargin to Geometry::*ContentWidthAndMargin and Geometry::*ContentHeightAndMargin.
     10
     11        * layout/FormattingContext.h:
     12        * layout/FormattingContextGeometry.cpp:
     13        (WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry const):
     14        (WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedHorizontalGeometry):
     15        (WebCore::Layout::FormattingContext::Geometry::floatingNonReplacedContentWidthAndMargin):
     16        (WebCore::Layout::FormattingContext::Geometry::floatingReplacedContentHeightAndMargin const):
     17        (WebCore::Layout::FormattingContext::Geometry::floatingReplacedContentWidthAndMargin):
     18        (WebCore::Layout::FormattingContext::Geometry::floatingContentHeightAndMargin const):
     19        (WebCore::Layout::FormattingContext::Geometry::floatingContentWidthAndMargin):
     20        (WebCore::Layout::FormattingContext::Geometry::inlineReplacedContentHeightAndMargin const):
     21        (WebCore::Layout::FormattingContext::Geometry::inlineReplacedContentWidthAndMargin):
     22        (WebCore::Layout::FormattingContext::Geometry::floatingNonReplacedWidthAndMargin): Deleted.
     23        (WebCore::Layout::FormattingContext::Geometry::floatingReplacedHeightAndMargin const): Deleted.
     24        (WebCore::Layout::FormattingContext::Geometry::floatingReplacedWidthAndMargin): Deleted.
     25        (WebCore::Layout::FormattingContext::Geometry::floatingHeightAndMargin const): Deleted.
     26        (WebCore::Layout::FormattingContext::Geometry::floatingWidthAndMargin): Deleted.
     27        (WebCore::Layout::FormattingContext::Geometry::inlineReplacedHeightAndMargin const): Deleted.
     28        (WebCore::Layout::FormattingContext::Geometry::inlineReplacedWidthAndMargin): Deleted.
     29        * layout/blockformatting/BlockFormattingContext.cpp:
     30        (WebCore::Layout::BlockFormattingContext::computeWidthAndMargin):
     31        (WebCore::Layout::BlockFormattingContext::computeHeightAndMargin):
     32        * layout/blockformatting/BlockFormattingContext.h:
     33        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
     34        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedContentHeightAndMargin):
     35        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedContentWidthAndMargin):
     36        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowReplacedContentWidthAndMargin):
     37        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowContentHeightAndMargin):
     38        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowContentWidthAndMargin):
     39        (WebCore::Layout::BlockFormattingContext::Geometry::computedContentWidthAndMargin):
     40        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin): Deleted.
     41        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin): Deleted.
     42        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowReplacedWidthAndMargin): Deleted.
     43        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowHeightAndMargin): Deleted.
     44        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowWidthAndMargin): Deleted.
     45        (WebCore::Layout::BlockFormattingContext::Geometry::computedWidthAndMargin): Deleted.
     46        * layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp:
     47        (WebCore::Layout::TableWrapperBlockFormattingContext::computeWidthAndMarginForTableBox):
     48        (WebCore::Layout::TableWrapperBlockFormattingContext::computeHeightAndMarginForTableBox):
     49        * layout/inlineformatting/InlineFormattingContext.cpp:
     50        (WebCore::Layout::InlineFormattingContext::computeWidthAndMargin):
     51        (WebCore::Layout::InlineFormattingContext::computeHeightAndMargin):
     52        * layout/inlineformatting/InlineFormattingContext.h:
     53        * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
     54        (WebCore::Layout::InlineFormattingContext::Geometry::inlineBlockContentWidthAndMargin):
     55        (WebCore::Layout::InlineFormattingContext::Geometry::inlineBlockContentHeightAndMargin const):
     56        (WebCore::Layout::InlineFormattingContext::Geometry::inlineBlockWidthAndMargin): Deleted.
     57        (WebCore::Layout::InlineFormattingContext::Geometry::inlineBlockHeightAndMargin const): Deleted.
     58
    1592020-10-26  Youenn Fablet  <youenn@apple.com>
    260

  • trunk/Source/WebCore/layout/FormattingContext.h

    r268456 r268974  
    127127        HorizontalGeometry outOfFlowHorizontalGeometry(const Box&, const HorizontalConstraints&, const VerticalConstraints&, const OverriddenHorizontalValues&);
    128128
    129         ContentHeightAndMargin floatingHeightAndMargin(const Box&, const HorizontalConstraints&, const OverriddenVerticalValues&) const;
    130         ContentWidthAndMargin floatingWidthAndMargin(const Box&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
    131 
    132         ContentHeightAndMargin inlineReplacedHeightAndMargin(const ReplacedBox&, const HorizontalConstraints&, Optional<VerticalConstraints>, const OverriddenVerticalValues&) const;
    133         ContentWidthAndMargin inlineReplacedWidthAndMargin(const ReplacedBox&, const HorizontalConstraints&, Optional<VerticalConstraints>, const OverriddenHorizontalValues&);
     129        ContentHeightAndMargin floatingContentHeightAndMargin(const Box&, const HorizontalConstraints&, const OverriddenVerticalValues&) const;
     130        ContentWidthAndMargin floatingContentWidthAndMargin(const Box&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
     131
     132        ContentHeightAndMargin inlineReplacedContentHeightAndMargin(const ReplacedBox&, const HorizontalConstraints&, Optional<VerticalConstraints>, const OverriddenVerticalValues&) const;
     133        ContentWidthAndMargin inlineReplacedContentWidthAndMargin(const ReplacedBox&, const HorizontalConstraints&, Optional<VerticalConstraints>, const OverriddenHorizontalValues&);
    134134
    135135        LayoutSize inFlowPositionedPositionOffset(const Box&, const HorizontalConstraints&) const;
    … …  
    178178        HorizontalGeometry outOfFlowNonReplacedHorizontalGeometry(const ContainerBox&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
    179179
    180         ContentHeightAndMargin floatingReplacedHeightAndMargin(const ReplacedBox&, const HorizontalConstraints&, const OverriddenVerticalValues&) const;
    181         ContentWidthAndMargin floatingReplacedWidthAndMargin(const ReplacedBox&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
    182 
    183         ContentWidthAndMargin floatingNonReplacedWidthAndMargin(const Box&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
     180        ContentHeightAndMargin floatingReplacedContentHeightAndMargin(const ReplacedBox&, const HorizontalConstraints&, const OverriddenVerticalValues&) const;
     181        ContentWidthAndMargin floatingReplacedContentWidthAndMargin(const ReplacedBox&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
     182
     183        ContentWidthAndMargin floatingNonReplacedContentWidthAndMargin(const Box&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
    184184
    185185        LayoutUnit staticVerticalPositionForOutOfFlowPositioned(const Box&, const VerticalConstraints&) const;

  • trunk/Source/WebCore/layout/FormattingContextGeometry.cpp

    r268948 r268974  
    638638    auto top = computedValue(style.logicalTop(), containingBlockWidth);
    639639    auto bottom = computedValue(style.logicalBottom(), containingBlockWidth);
    640     auto height = inlineReplacedHeightAndMargin(replacedBox, horizontalConstraints, verticalConstraints, overriddenVerticalValues).contentHeight;
     640    auto height = inlineReplacedContentHeightAndMargin(replacedBox, horizontalConstraints, verticalConstraints, overriddenVerticalValues).contentHeight;
    641641    auto computedVerticalMargin = Geometry::computedVerticalMargin(replacedBox, horizontalConstraints);
    642642    Optional<LayoutUnit> usedMarginBefore = computedVerticalMargin.before;
    … …  
    726726    Optional<LayoutUnit> usedMarginStart = computedHorizontalMargin.start;
    727727    Optional<LayoutUnit> usedMarginEnd = computedHorizontalMargin.end;
    728     auto width = inlineReplacedWidthAndMargin(replacedBox, horizontalConstraints, verticalConstraints, overriddenHorizontalValues).contentWidth;
     728    auto width = inlineReplacedContentWidthAndMargin(replacedBox, horizontalConstraints, verticalConstraints, overriddenHorizontalValues).contentWidth;
    729729    auto paddingLeft = boxGeometry.paddingLeft().valueOr(0);
    730730    auto paddingRight = boxGeometry.paddingRight().valueOr(0);
    … …  
    852852}
    853853
    854 ContentWidthAndMargin FormattingContext::Geometry::floatingNonReplacedWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
     854ContentWidthAndMargin FormattingContext::Geometry::floatingNonReplacedContentWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
    855855{
    856856    ASSERT(layoutBox.isFloatingPositioned() && !layoutBox.isReplacedBox());
    … …  
    874874}
    875875
    876 ContentHeightAndMargin FormattingContext::Geometry::floatingReplacedHeightAndMargin(const ReplacedBox& replacedBox, const HorizontalConstraints& horizontalConstraints, const OverriddenVerticalValues& overriddenVerticalValues) const
     876ContentHeightAndMargin FormattingContext::Geometry::floatingReplacedContentHeightAndMargin(const ReplacedBox& replacedBox, const HorizontalConstraints& horizontalConstraints, const OverriddenVerticalValues& overriddenVerticalValues) const
    877877{
    878878    ASSERT(replacedBox.isFloatingPositioned());
    … …  
    881881    // replaced elements in normal flow and floating replaced elements
    882882    LOG_WITH_STREAM(FormattingContextLayout, stream << "[Height][Margin] -> floating replaced -> redirected to inline replaced");
    883     return inlineReplacedHeightAndMargin(replacedBox, horizontalConstraints, { }, overriddenVerticalValues);
    884 }
    885 
    886 ContentWidthAndMargin FormattingContext::Geometry::floatingReplacedWidthAndMargin(const ReplacedBox& replacedBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
     883    return inlineReplacedContentHeightAndMargin(replacedBox, horizontalConstraints, { }, overriddenVerticalValues);
     884}
     885
     886ContentWidthAndMargin FormattingContext::Geometry::floatingReplacedContentWidthAndMargin(const ReplacedBox& replacedBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
    887887{
    888888    ASSERT(replacedBox.isFloatingPositioned());
    … …  
    896896    LOG_WITH_STREAM(FormattingContextLayout, stream << "[Height][Margin] -> floating replaced -> redirected to inline replaced");
    897897    auto usedMargin = UsedHorizontalMargin { computedHorizontalMargin.start.valueOr(0), computedHorizontalMargin.end.valueOr(0) };
    898     return inlineReplacedWidthAndMargin(replacedBox, horizontalConstraints, { }, { overriddenHorizontalValues.width, usedMargin });
     898    return inlineReplacedContentWidthAndMargin(replacedBox, horizontalConstraints, { }, { overriddenHorizontalValues.width, usedMargin });
    899899}
    900900
    … …  
    917917}
    918918
    919 ContentHeightAndMargin FormattingContext::Geometry::floatingHeightAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenVerticalValues& overriddenVerticalValues) const
     919ContentHeightAndMargin FormattingContext::Geometry::floatingContentHeightAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenVerticalValues& overriddenVerticalValues) const
    920920{
    921921    ASSERT(layoutBox.isFloatingPositioned());
    … …  
    923923    if (!layoutBox.isReplacedBox())
    924924        return complicatedCases(layoutBox, horizontalConstraints, overriddenVerticalValues);
    925     return floatingReplacedHeightAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, overriddenVerticalValues);
    926 }
    927 
    928 ContentWidthAndMargin FormattingContext::Geometry::floatingWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
     925    return floatingReplacedContentHeightAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, overriddenVerticalValues);
     926}
     927
     928ContentWidthAndMargin FormattingContext::Geometry::floatingContentWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
    929929{
    930930    ASSERT(layoutBox.isFloatingPositioned());
    931931
    932932    if (!layoutBox.isReplacedBox())
    933         return floatingNonReplacedWidthAndMargin(layoutBox, horizontalConstraints, overriddenHorizontalValues);
    934     return floatingReplacedWidthAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, overriddenHorizontalValues);
    935 }
    936 
    937 ContentHeightAndMargin FormattingContext::Geometry::inlineReplacedHeightAndMargin(const ReplacedBox& replacedBox, const HorizontalConstraints& horizontalConstraints, Optional<VerticalConstraints> verticalConstraints, const OverriddenVerticalValues& overriddenVerticalValues) const
     933        return floatingNonReplacedContentWidthAndMargin(layoutBox, horizontalConstraints, overriddenHorizontalValues);
     934    return floatingReplacedContentWidthAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, overriddenHorizontalValues);
     935}
     936
     937ContentHeightAndMargin FormattingContext::Geometry::inlineReplacedContentHeightAndMargin(const ReplacedBox& replacedBox, const HorizontalConstraints& horizontalConstraints, Optional<VerticalConstraints> verticalConstraints, const OverriddenVerticalValues& overriddenVerticalValues) const
    938938{
    939939    // 10.6.2 Inline replaced elements, block-level replaced elements in normal flow, 'inline-block' replaced elements in normal flow and floating replaced elements
    … …  
    981981}
    982982
    983 ContentWidthAndMargin FormattingContext::Geometry::inlineReplacedWidthAndMargin(const ReplacedBox& replacedBox, const HorizontalConstraints& horizontalConstraints, Optional<VerticalConstraints> verticalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
     983ContentWidthAndMargin FormattingContext::Geometry::inlineReplacedContentWidthAndMargin(const ReplacedBox& replacedBox, const HorizontalConstraints& horizontalConstraints, Optional<VerticalConstraints> verticalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
    984984{
    985985    // 10.3.2 Inline, replaced elements

  • trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp

    r268948 r268974  
    323323        availableWidthFloatAvoider = usedAvailableWidthForFloatAvoider(floatingContext, layoutBox, constraintsPair);
    324324    }
    325     auto contentWidthAndMargin = geometry().computedWidthAndMargin(layoutBox, constraintsPair.containingBlock.horizontal, availableWidthFloatAvoider);
     325    auto contentWidthAndMargin = geometry().computedContentWidthAndMargin(layoutBox, constraintsPair.containingBlock.horizontal, availableWidthFloatAvoider);
    326326    auto& boxGeometry = formattingState().boxGeometry(layoutBox);
    327327    boxGeometry.setContentBoxWidth(contentWidthAndMargin.contentWidth);
    … …  
    333333    auto compute = [&](Optional<LayoutUnit> usedHeight) -> ContentHeightAndMargin {
    334334        if (layoutBox.isInFlow())
    335             return geometry().inFlowHeightAndMargin(layoutBox, constraints.horizontal, { usedHeight });
     335            return geometry().inFlowContentHeightAndMargin(layoutBox, constraints.horizontal, { usedHeight });
    336336
    337337        if (layoutBox.isFloatingPositioned())
    338             return geometry().floatingHeightAndMargin(layoutBox, constraints.horizontal, { usedHeight });
     338            return geometry().floatingContentHeightAndMargin(layoutBox, constraints.horizontal, { usedHeight });
    339339
    340340        ASSERT_NOT_REACHED();

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

    r268456 r268974  
    7777        Geometry(const BlockFormattingContext&);
    7878
    79         ContentHeightAndMargin inFlowHeightAndMargin(const Box&, const HorizontalConstraints&, const OverriddenVerticalValues&);
    80         ContentWidthAndMargin inFlowWidthAndMargin(const Box&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
     79        ContentHeightAndMargin inFlowContentHeightAndMargin(const Box&, const HorizontalConstraints&, const OverriddenVerticalValues&);
     80        ContentWidthAndMargin inFlowContentWidthAndMargin(const Box&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
    8181
    8282        Point staticPosition(const Box&, const HorizontalConstraints&, const VerticalConstraints&) const;
    … …  
    8686        IntrinsicWidthConstraints intrinsicWidthConstraints(const Box&);
    8787
    88         ContentWidthAndMargin computedWidthAndMargin(const Box&, const HorizontalConstraints&, Optional<LayoutUnit> availableWidthFloatAvoider);
     88        ContentWidthAndMargin computedContentWidthAndMargin(const Box&, const HorizontalConstraints&, Optional<LayoutUnit> availableWidthFloatAvoider);
    8989
    9090    private:
    91         ContentHeightAndMargin inFlowNonReplacedHeightAndMargin(const Box&, const HorizontalConstraints&, const OverriddenVerticalValues&);
    92         ContentWidthAndMargin inFlowNonReplacedWidthAndMargin(const Box&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
    93         ContentWidthAndMargin inFlowReplacedWidthAndMargin(const ReplacedBox&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
     91        ContentHeightAndMargin inFlowNonReplacedContentHeightAndMargin(const Box&, const HorizontalConstraints&, const OverriddenVerticalValues&);
     92        ContentWidthAndMargin inFlowNonReplacedContentWidthAndMargin(const Box&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
     93        ContentWidthAndMargin inFlowReplacedContentWidthAndMargin(const ReplacedBox&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
    9494
    9595        const BlockFormattingContext& formattingContext() const { return downcast<BlockFormattingContext>(FormattingContext::Geometry::formattingContext()); }

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

    r268948 r268974  
    4343namespace Layout {
    4444
    45 ContentHeightAndMargin BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenVerticalValues& overriddenVerticalValues)
     45ContentHeightAndMargin BlockFormattingContext::Geometry::inFlowNonReplacedContentHeightAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenVerticalValues& overriddenVerticalValues)
    4646{
    4747    ASSERT(layoutBox.isInFlow() && !layoutBox.isReplacedBox());
    … …  
    113113}
    114114
    115 ContentWidthAndMargin BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
     115ContentWidthAndMargin BlockFormattingContext::Geometry::inFlowNonReplacedContentWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
    116116{
    117117    ASSERT(layoutBox.isInFlow());
    … …  
    213213}
    214214
    215 ContentWidthAndMargin BlockFormattingContext::Geometry::inFlowReplacedWidthAndMargin(const ReplacedBox& replacedBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
     215ContentWidthAndMargin BlockFormattingContext::Geometry::inFlowReplacedContentWidthAndMargin(const ReplacedBox& replacedBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
    216216{
    217217    ASSERT(replacedBox.isInFlow());
    … …  
    223223
    224224    // #1
    225     auto usedWidth = inlineReplacedWidthAndMargin(replacedBox, horizontalConstraints, { }, overriddenHorizontalValues).contentWidth;
     225    auto usedWidth = inlineReplacedContentWidthAndMargin(replacedBox, horizontalConstraints, { }, overriddenHorizontalValues).contentWidth;
    226226    // #2
    227     auto nonReplacedWidthAndMargin = inFlowNonReplacedWidthAndMargin(replacedBox, horizontalConstraints, OverriddenHorizontalValues { usedWidth, overriddenHorizontalValues.margin });
     227    auto nonReplacedWidthAndMargin = inFlowNonReplacedContentWidthAndMargin(replacedBox, horizontalConstraints, OverriddenHorizontalValues { usedWidth, overriddenHorizontalValues.margin });
    228228
    229229    LOG_WITH_STREAM(FormattingContextLayout, stream << "[Width][Margin] -> inflow replaced -> width(" << usedWidth  << "px) margin(" << nonReplacedWidthAndMargin.usedMargin.start << "px, " << nonReplacedWidthAndMargin.usedMargin.end << "px) -> layoutBox(" << &replacedBox << ")");
    … …  
    256256}
    257257
    258 ContentHeightAndMargin BlockFormattingContext::Geometry::inFlowHeightAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenVerticalValues& overriddenVerticalValues)
     258ContentHeightAndMargin BlockFormattingContext::Geometry::inFlowContentHeightAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenVerticalValues& overriddenVerticalValues)
    259259{
    260260    ASSERT(layoutBox.isInFlow());
    … …  
    263263    // replaced elements in normal flow and floating replaced elements
    264264    if (layoutBox.isReplacedBox())
    265         return inlineReplacedHeightAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, { }, overriddenVerticalValues);
     265        return inlineReplacedContentHeightAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, { }, overriddenVerticalValues);
    266266
    267267    ContentHeightAndMargin contentHeightAndMargin;
    268268    if (layoutBox.isOverflowVisible() && !layoutBox.isDocumentBox()) {
    269269        // TODO: Figure out the case for the document element. Let's just complicated-case it for now.
    270         contentHeightAndMargin = inFlowNonReplacedHeightAndMargin(layoutBox, horizontalConstraints, overriddenVerticalValues);
     270        contentHeightAndMargin = inFlowNonReplacedContentHeightAndMargin(layoutBox, horizontalConstraints, overriddenVerticalValues);
    271271    } else {
    272272        // 10.6.6 Complicated cases
    … …  
    285285}
    286286
    287 ContentWidthAndMargin BlockFormattingContext::Geometry::inFlowWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
     287ContentWidthAndMargin BlockFormattingContext::Geometry::inFlowContentWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
    288288{
    289289    ASSERT(layoutBox.isInFlow());
    290290
    291291    if (!layoutBox.isReplacedBox())
    292         return inFlowNonReplacedWidthAndMargin(layoutBox, horizontalConstraints, overriddenHorizontalValues);
    293     return inFlowReplacedWidthAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, overriddenHorizontalValues);
    294 }
    295 
    296 ContentWidthAndMargin BlockFormattingContext::Geometry::computedWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, Optional<LayoutUnit> availableWidthFloatAvoider)
     292        return inFlowNonReplacedContentWidthAndMargin(layoutBox, horizontalConstraints, overriddenHorizontalValues);
     293    return inFlowReplacedContentWidthAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, overriddenHorizontalValues);
     294}
     295
     296ContentWidthAndMargin BlockFormattingContext::Geometry::computedContentWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, Optional<LayoutUnit> availableWidthFloatAvoider)
    297297{
    298298    auto compute = [&] (auto constraintsForWidth, Optional<LayoutUnit> usedWidth) {
    299299        if (layoutBox.isFloatingPositioned())
    300             return floatingWidthAndMargin(layoutBox, constraintsForWidth, { usedWidth, { } });
     300            return floatingContentWidthAndMargin(layoutBox, constraintsForWidth, { usedWidth, { } });
    301301
    302302        if (layoutBox.isInFlow())
    303             return inFlowWidthAndMargin(layoutBox, constraintsForWidth, { usedWidth, { } });
     303            return inFlowContentWidthAndMargin(layoutBox, constraintsForWidth, { usedWidth, { } });
    304304
    305305        ASSERT_NOT_REACHED();

  • trunk/Source/WebCore/layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp

    r268456 r268974  
    206206    }
    207207
    208     auto contentWidthAndMargin = geometry.inFlowWidthAndMargin(tableBox, horizontalConstraints, OverriddenHorizontalValues { usedWidth, { } });
     208    auto contentWidthAndMargin = geometry.inFlowContentWidthAndMargin(tableBox, horizontalConstraints, OverriddenHorizontalValues { usedWidth, { } });
    209209
    210210    auto& boxGeometry = formattingState().boxGeometry(tableBox);
    … …  
    218218    // Table is a special BFC content. Its height is mainly driven by the content. Computed height, min-height and max-height are all
    219219    // already been taken into account during the TFC layout.
    220     auto heightAndMargin = geometry().inFlowHeightAndMargin(tableBox, constraints.horizontal, { quirks().overriddenTableHeight(tableBox) });
     220    auto heightAndMargin = geometry().inFlowContentHeightAndMargin(tableBox, constraints.horizontal, { quirks().overriddenTableHeight(tableBox) });
    221221
    222222    auto marginCollapse = this->marginCollapse();

  • trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp

    r268948 r268974  
    298298    auto compute = [&](Optional<LayoutUnit> usedWidth) {
    299299        if (layoutBox.isFloatingPositioned())
    300             return geometry().floatingWidthAndMargin(layoutBox, horizontalConstraints, { usedWidth, { } });
     300            return geometry().floatingContentWidthAndMargin(layoutBox, horizontalConstraints, { usedWidth, { } });
    301301        if (layoutBox.isInlineBlockBox())
    302             return geometry().inlineBlockWidthAndMargin(layoutBox, horizontalConstraints, { usedWidth, { } });
     302            return geometry().inlineBlockContentWidthAndMargin(layoutBox, horizontalConstraints, { usedWidth, { } });
    303303        if (layoutBox.isReplacedBox())
    304             return geometry().inlineReplacedWidthAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, { }, { usedWidth, { } });
     304            return geometry().inlineReplacedContentWidthAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, { }, { usedWidth, { } });
    305305        ASSERT_NOT_REACHED();
    306306        return ContentWidthAndMargin { };
    … …  
    330330    auto compute = [&](Optional<LayoutUnit> usedHeight) {
    331331        if (layoutBox.isFloatingPositioned())
    332             return geometry().floatingHeightAndMargin(layoutBox, horizontalConstraints, { usedHeight });
     332            return geometry().floatingContentHeightAndMargin(layoutBox, horizontalConstraints, { usedHeight });
    333333        if (layoutBox.isInlineBlockBox())
    334             return geometry().inlineBlockHeightAndMargin(layoutBox, horizontalConstraints, { usedHeight });
     334            return geometry().inlineBlockContentHeightAndMargin(layoutBox, horizontalConstraints, { usedHeight });
    335335        if (layoutBox.isReplacedBox())
    336             return geometry().inlineReplacedHeightAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, { }, { usedHeight });
     336            return geometry().inlineReplacedContentHeightAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, { }, { usedHeight });
    337337        ASSERT_NOT_REACHED();
    338338        return ContentHeightAndMargin { };

  • trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h

    r268864 r268974  
    7171        InlineLayoutUnit logicalTopForNextLine(const LineBuilder::LineContent&, InlineLayoutUnit previousLineLogicalBottom, const FloatingContext&) const;
    7272
    73         ContentHeightAndMargin inlineBlockHeightAndMargin(const Box&, const HorizontalConstraints&, const OverriddenVerticalValues&) const;
    74         ContentWidthAndMargin inlineBlockWidthAndMargin(const Box&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
     73        ContentHeightAndMargin inlineBlockContentHeightAndMargin(const Box&, const HorizontalConstraints&, const OverriddenVerticalValues&) const;
     74        ContentWidthAndMargin inlineBlockContentWidthAndMargin(const Box&, const HorizontalConstraints&, const OverriddenHorizontalValues&);
    7575
    7676    private:

  • trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp

    r268924 r268974  
    457457}
    458458
    459 ContentWidthAndMargin InlineFormattingContext::Geometry::inlineBlockWidthAndMargin(const Box& formattingContextRoot, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
     459ContentWidthAndMargin InlineFormattingContext::Geometry::inlineBlockContentWidthAndMargin(const Box& formattingContextRoot, const HorizontalConstraints& horizontalConstraints, const OverriddenHorizontalValues& overriddenHorizontalValues)
    460460{
    461461    ASSERT(formattingContextRoot.isInFlow());
    … …  
    465465    // Exactly as inline replaced elements.
    466466    if (formattingContextRoot.isReplacedBox())
    467         return inlineReplacedWidthAndMargin(downcast<ReplacedBox>(formattingContextRoot), horizontalConstraints, { }, overriddenHorizontalValues);
     467        return inlineReplacedContentWidthAndMargin(downcast<ReplacedBox>(formattingContextRoot), horizontalConstraints, { }, overriddenHorizontalValues);
    468468
    469469    // 10.3.9 'Inline-block', non-replaced elements in normal flow
    … …  
    482482}
    483483
    484 ContentHeightAndMargin InlineFormattingContext::Geometry::inlineBlockHeightAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenVerticalValues& overriddenVerticalValues) const
     484ContentHeightAndMargin InlineFormattingContext::Geometry::inlineBlockContentHeightAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, const OverriddenVerticalValues& overriddenVerticalValues) const
    485485{
    486486    ASSERT(layoutBox.isInFlow());
    … …  
    488488    // 10.6.2 Inline replaced elements, block-level replaced elements in normal flow, 'inline-block' replaced elements in normal flow and floating replaced elements
    489489    if (layoutBox.isReplacedBox())
    490         return inlineReplacedHeightAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, { }, overriddenVerticalValues);
     490        return inlineReplacedContentHeightAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, { }, overriddenVerticalValues);
    491491
    492492    // 10.6.6 Complicated cases
Note: See TracChangeset for help on using the changeset viewer.