Changeset 209903 in webkit


Ignore:
Timestamp:
Dec 15, 2016 8:37:28 PM (7 years ago)
Author:
Alan Bujtas
Message:

Change ::computeLogicalHeight's computedValues out argument to the return value.
​https://bugs.webkit.org/show_bug.cgi?id=165789

Reviewed by Simon Fraser.

No change in functionality.

  • html/shadow/SliderThumbElement.cpp:

(WebCore::RenderSliderContainer::computeLogicalHeight):

  • html/shadow/mac/ImageControlsButtonElementMac.cpp:

(WebCore::RenderImageControlsButton::computeLogicalHeight):

  • html/shadow/mac/ImageControlsRootElementMac.cpp:

(WebCore::RenderImageControls::computeLogicalHeight):

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
(WebCore::RenderBlock::estimateRegionRangeForBoxChild):

  • rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::checkForPaginationLogicalHeightChange):

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::updateLogicalHeight):
(WebCore::RenderBox::computeLogicalHeight):
(WebCore::RenderBox::computePercentageLogicalHeight):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing):
(WebCore::RenderBox::availableLogicalHeightUsing):

  • rendering/RenderBox.h:

(WebCore::RenderBox::ComputedMarginValues::ComputedMarginValues): Deleted.
(WebCore::RenderBox::LogicalExtentComputedValues::LogicalExtentComputedValues): Deleted.

  • rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::mainAxisContentExtent):

  • rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::computeLogicalHeight):

  • rendering/RenderFlowThread.h:
  • rendering/RenderListBox.cpp:

(WebCore::RenderListBox::computeLogicalHeight):

  • rendering/RenderListBox.h:
  • rendering/RenderMeter.cpp:

(WebCore::RenderMeter::computeLogicalHeight):

  • rendering/RenderMeter.h:
  • rendering/RenderMultiColumnFlowThread.cpp:

(WebCore::RenderMultiColumnFlowThread::computeLogicalHeight):

  • rendering/RenderMultiColumnFlowThread.h:
  • rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::computeLogicalHeight):

  • rendering/RenderMultiColumnSet.h:
  • rendering/RenderProgress.cpp:

(WebCore::RenderProgress::computeLogicalHeight):

  • rendering/RenderProgress.h:
  • rendering/RenderTextControl.cpp:

(WebCore::RenderTextControl::computeLogicalHeight):

  • rendering/RenderTextControl.h:
  • rendering/RenderView.cpp:

(WebCore::RenderView::computeLogicalHeight):

  • rendering/RenderView.h:
  • rendering/svg/RenderSVGForeignObject.cpp:

(WebCore::RenderSVGForeignObject::computeLogicalHeight):

  • rendering/svg/RenderSVGForeignObject.h:
Location:
trunk/Source/WebCore
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r209901 r209903  
     12016-12-15  Zalan Bujtas  <zalan@apple.com>
     2
     3        Change ::computeLogicalHeight's computedValues out argument to the return value.
     4        https://bugs.webkit.org/show_bug.cgi?id=165789
     5
     6        Reviewed by Simon Fraser.
     7
     8        No change in functionality.
     9
     10        * html/shadow/SliderThumbElement.cpp:
     11        (WebCore::RenderSliderContainer::computeLogicalHeight):
     12        * html/shadow/mac/ImageControlsButtonElementMac.cpp:
     13        (WebCore::RenderImageControlsButton::computeLogicalHeight):
     14        * html/shadow/mac/ImageControlsRootElementMac.cpp:
     15        (WebCore::RenderImageControls::computeLogicalHeight):
     16        * rendering/RenderBlock.cpp:
     17        (WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
     18        (WebCore::RenderBlock::estimateRegionRangeForBoxChild):
     19        * rendering/RenderBlockFlow.cpp:
     20        (WebCore::RenderBlockFlow::checkForPaginationLogicalHeightChange):
     21        * rendering/RenderBox.cpp:
     22        (WebCore::RenderBox::updateLogicalHeight):
     23        (WebCore::RenderBox::computeLogicalHeight):
     24        (WebCore::RenderBox::computePercentageLogicalHeight):
     25        (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
     26        (WebCore::RenderBox::availableLogicalHeightUsing):
     27        * rendering/RenderBox.h:
     28        (WebCore::RenderBox::ComputedMarginValues::ComputedMarginValues): Deleted.
     29        (WebCore::RenderBox::LogicalExtentComputedValues::LogicalExtentComputedValues): Deleted.
     30        * rendering/RenderFlexibleBox.cpp:
     31        (WebCore::RenderFlexibleBox::mainAxisContentExtent):
     32        * rendering/RenderFlowThread.cpp:
     33        (WebCore::RenderFlowThread::computeLogicalHeight):
     34        * rendering/RenderFlowThread.h:
     35        * rendering/RenderListBox.cpp:
     36        (WebCore::RenderListBox::computeLogicalHeight):
     37        * rendering/RenderListBox.h:
     38        * rendering/RenderMeter.cpp:
     39        (WebCore::RenderMeter::computeLogicalHeight):
     40        * rendering/RenderMeter.h:
     41        * rendering/RenderMultiColumnFlowThread.cpp:
     42        (WebCore::RenderMultiColumnFlowThread::computeLogicalHeight):
     43        * rendering/RenderMultiColumnFlowThread.h:
     44        * rendering/RenderMultiColumnSet.cpp:
     45        (WebCore::RenderMultiColumnSet::computeLogicalHeight):
     46        * rendering/RenderMultiColumnSet.h:
     47        * rendering/RenderProgress.cpp:
     48        (WebCore::RenderProgress::computeLogicalHeight):
     49        * rendering/RenderProgress.h:
     50        * rendering/RenderTextControl.cpp:
     51        (WebCore::RenderTextControl::computeLogicalHeight):
     52        * rendering/RenderTextControl.h:
     53        * rendering/RenderView.cpp:
     54        (WebCore::RenderView::computeLogicalHeight):
     55        * rendering/RenderView.h:
     56        * rendering/svg/RenderSVGForeignObject.cpp:
     57        (WebCore::RenderSVGForeignObject::computeLogicalHeight):
     58        * rendering/svg/RenderSVGForeignObject.h:
     59
    1602016-12-15  Chris Dumez  <cdumez@apple.com>
    261

  • trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

    r208985 r209903  
    120120
    121121public:
    122     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     122    RenderBox::LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    123123
    124124private:
    … …  
    127127};
    128128
    129 void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     129RenderBox::LogicalExtentComputedValues RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
    130130{
    131131    ASSERT(element()->shadowHost());
    … …  
    147147            trackHeight *= zoomFactor;
    148148
    149         RenderBox::computeLogicalHeight(trackHeight, logicalTop, computedValues);
    150         return;
     149        return RenderBox::computeLogicalHeight(trackHeight, logicalTop);
    151150    }
    152151#endif
    153152    if (isVertical)
    154153        logicalHeight = RenderSlider::defaultTrackLength;
    155     RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
     154    return RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
    156155}
    157156

  • trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp

    r205249 r209903  
    5151private:
    5252    void updateLogicalWidth() override;
    53     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     53    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    5454
    5555    const char* renderName() const override { return "RenderImageControlsButton"; }
    … …  
    7474}
    7575
    76 void RenderImageControlsButton::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     76RenderBox::LogicalExtentComputedValues RenderImageControlsButton::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
    7777{
    78     RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
    79 
     78    auto computedValues = RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
    8079    IntSize frameSize = theme().imageControlsButtonSize(*this);
    8180    computedValues.m_extent = isHorizontalWritingMode() ? frameSize.height() : frameSize.width();
     81    return computedValues;
    8282}
    8383

  • trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp

    r203302 r209903  
    4444private:
    4545    void updateLogicalWidth() override;
    46     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     46    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    4747
    4848    const char* renderName() const override { return "RenderImageControls"; }
    … …  
    7070}
    7171
    72 void RenderImageControls::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     72RenderBox::LogicalExtentComputedValues RenderImageControls::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
    7373{
    74     RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
    75 
     74    auto computedValues = RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
    7675    RenderElement* renderer = element()->shadowHost()->renderer();
    7776    if (!is<RenderImage>(*renderer))
    78         return;
     77        return computedValues;
    7978
    8079    computedValues.m_extent = downcast<RenderImage>(*renderer).logicalHeight();
     80    return computedValues;
    8181}
    8282

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r209427 r209903  
    27942794        if (is<RenderBox>(*child) && child->isHorizontalWritingMode() != isHorizontalWritingMode()) {
    27952795            auto& childBox = downcast<RenderBox>(*child);
    2796             LogicalExtentComputedValues computedValues;
    2797             childBox.computeLogicalHeight(childBox.borderAndPaddingLogicalHeight(), 0, computedValues);
    2798             childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = computedValues.m_extent;
     2796            childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = childBox.computeLogicalHeight(childBox.borderAndPaddingLogicalHeight(), 0).m_extent;
    27992797        } else {
    28002798            childMinPreferredLogicalWidth = child->minPreferredLogicalWidth();
    … …  
    36403638    }
    36413639
    3642     LogicalExtentComputedValues estimatedValues;
    3643     box.computeLogicalHeight(RenderFlowThread::maxLogicalHeight(), logicalTopForChild(box), estimatedValues);
    3644 
     3640    auto estimatedValues = box.computeLogicalHeight(RenderFlowThread::maxLogicalHeight(), logicalTopForChild(box));
    36453641    LayoutUnit offsetFromLogicalTopOfFirstRegion = box.offsetFromLogicalTopOfFirstPage();
    36463642    RenderRegion* startRegion = flowThread->regionAtBlockOffset(this, offsetFromLogicalTopOfFirstRegion, true);

  • trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

    r209719 r209903  
    39343934        LayoutUnit newColumnHeight;
    39353935        if (hasDefiniteLogicalHeight() || view().frameView().pagination().mode != Pagination::Unpaginated) {
    3936             LogicalExtentComputedValues computedValues;
    3937             computeLogicalHeight(LayoutUnit(), logicalTop(), computedValues);
     3936            auto computedValues = computeLogicalHeight(LayoutUnit(), logicalTop());
    39383937            newColumnHeight = std::max<LayoutUnit>(computedValues.m_extent - borderAndPaddingLogicalHeight() - scrollbarLogicalHeight(), 0);
    39393938            if (flowThread->columnHeightAvailable() != newColumnHeight)

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r209438 r209903  
    27792779void RenderBox::updateLogicalHeight()
    27802780{
    2781     LogicalExtentComputedValues computedValues;
    2782     computeLogicalHeight(logicalHeight(), logicalTop(), computedValues);
    2783 
     2781    auto computedValues = computeLogicalHeight(logicalHeight(), logicalTop());
    27842782    setLogicalHeight(computedValues.m_extent);
    27852783    setLogicalTop(computedValues.m_position);
    … …  
    27882786}
    27892787
    2790 void RenderBox::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
    2791 {
     2788RenderBox::LogicalExtentComputedValues RenderBox::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
     2789{
     2790    LogicalExtentComputedValues computedValues;
    27922791    computedValues.m_extent = logicalHeight;
    27932792    computedValues.m_position = logicalTop;
    … …  
    27952794    // Cell height is managed by the table and inline non-replaced elements do not support a height property.
    27962795    if (isTableCell() || (isInline() && !isReplaced()))
    2797         return;
     2796        return computedValues;
    27982797
    27992798    Length h;
    … …  
    28192818                    shouldFlipBeforeAfter ? computedValues.m_margins.m_before : computedValues.m_margins.m_after);
    28202819            }
    2821             return;
     2820            return computedValues;
    28222821        }
    28232822
    … …  
    29032902        }
    29042903    }
     2904    return computedValues;
    29052905}
    29062906
    … …  
    30403040        // Don't allow this to affect the block' height() member variable, since this
    30413041        // can get called while the block is still laying out its kids.
    3042         LogicalExtentComputedValues computedValues;
    3043         cb->computeLogicalHeight(cb->logicalHeight(), 0, computedValues);
     3042        auto computedValues = cb->computeLogicalHeight(cb->logicalHeight(), 0);
    30443043        availableHeight = computedValues.m_extent - cb->borderAndPaddingLogicalHeight() - cb->scrollbarLogicalHeight();
    30453044    } else if (cb->isRenderView())
    … …  
    31613160                ASSERT_WITH_SECURITY_IMPLICATION(container->isRenderBlock());
    31623161                auto& block = downcast<RenderBlock>(*container);
    3163                 LogicalExtentComputedValues computedValues;
    3164                 block.computeLogicalHeight(block.logicalHeight(), 0, computedValues);
     3162                auto computedValues = block.computeLogicalHeight(block.logicalHeight(), 0);
    31653163                LayoutUnit newContentHeight = computedValues.m_extent - block.borderAndPaddingLogicalHeight() - block.scrollbarLogicalHeight();
    31663164                LayoutUnit newHeight = block.adjustContentBoxLogicalHeightForBoxSizing(newContentHeight);
    … …  
    32343232    if (is<RenderBlock>(*this) && isOutOfFlowPositioned() && style().height().isAuto() && !(style().top().isAuto() || style().bottom().isAuto())) {
    32353233        RenderBlock& block = const_cast<RenderBlock&>(downcast<RenderBlock>(*this));
    3236         LogicalExtentComputedValues computedValues;
    3237         block.computeLogicalHeight(block.logicalHeight(), 0, computedValues);
     3234        auto computedValues = block.computeLogicalHeight(block.logicalHeight(), 0);
    32383235        LayoutUnit newContentHeight = computedValues.m_extent - block.borderAndPaddingLogicalHeight() - block.scrollbarLogicalHeight();
    32393236        return adjustContentBoxLogicalHeightForBoxSizing(newContentHeight);

  • trunk/Source/WebCore/rendering/RenderBox.h

    r208985 r209903  
    336336
    337337    struct ComputedMarginValues {
    338         ComputedMarginValues()
    339             : m_before(0)
    340             , m_after(0)
    341             , m_start(0)
    342             , m_end(0)
    343         {
    344         }
    345338        LayoutUnit m_before;
    346339        LayoutUnit m_after;
    … …  
    349342    };
    350343    struct LogicalExtentComputedValues {
    351         LogicalExtentComputedValues()
    352             : m_extent(0)
    353             , m_position(0)
    354         {
    355         }
    356 
    357344        LayoutUnit m_extent;
    358345        LayoutUnit m_position;
    … …  
    400387    virtual void updateLogicalWidth();
    401388    virtual void updateLogicalHeight();
    402     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const;
     389    virtual LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const;
    403390
    404391    RenderBoxRegionInfo* renderBoxRegionInfo(RenderRegion*, RenderBoxRegionInfoFlags = CacheRenderBoxRegionInfo) const;

  • trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

    r209068 r209903  
    443443{
    444444    if (isColumnFlow()) {
    445         LogicalExtentComputedValues computedValues;
    446445        LayoutUnit borderPaddingAndScrollbar = borderAndPaddingLogicalHeight() + scrollbarLogicalHeight();
    447446        if (contentLogicalHeight > LayoutUnit::max() - borderPaddingAndScrollbar)
    448447            contentLogicalHeight -= borderPaddingAndScrollbar;
    449448        LayoutUnit borderBoxLogicalHeight = contentLogicalHeight + borderPaddingAndScrollbar;
    450         computeLogicalHeight(borderBoxLogicalHeight, logicalTop(), computedValues);
     449        auto computedValues = computeLogicalHeight(borderBoxLogicalHeight, logicalTop());
    451450        if (computedValues.m_extent == LayoutUnit::max())
    452451            return computedValues.m_extent;

  • trunk/Source/WebCore/rendering/RenderFlowThread.cpp

    r209756 r209903  
    345345}
    346346
    347 void RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
    348 {
     347RenderBox::LogicalExtentComputedValues RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop) const
     348{
     349    LogicalExtentComputedValues computedValues;
    349350    computedValues.m_position = logicalTop;
    350351    computedValues.m_extent = 0;
    … …  
    359360        // If we reached the maximum size there's no point in going further.
    360361        if (computedValues.m_extent == maxFlowSize)
    361             return;
    362     }
     362            return computedValues;
     363    }
     364    return computedValues;
    363365}
    364366

  • trunk/Source/WebCore/rendering/RenderFlowThread.h

    r208668 r209903  
    7676
    7777    void updateLogicalWidth() final;
    78     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     78    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    7979
    8080    bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;

  • trunk/Source/WebCore/rendering/RenderListBox.cpp

    r208985 r209903  
    259259}
    260260
    261 void RenderListBox::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     261RenderBox::LogicalExtentComputedValues RenderListBox::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop) const
    262262{
    263263    LayoutUnit height = itemHeight() * size() - rowSpacing + verticalBorderAndPaddingExtent();
    264     RenderBox::computeLogicalHeight(height, logicalTop, computedValues);
     264    return RenderBox::computeLogicalHeight(height, logicalTop);
    265265}
    266266

  • trunk/Source/WebCore/rendering/RenderListBox.h

    r208985 r209903  
    8686    void computePreferredLogicalWidths() override;
    8787    int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
    88     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     88    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    8989
    9090    void layout() override;

  • trunk/Source/WebCore/rendering/RenderMeter.cpp

    r200041 r209903  
    5959}
    6060
    61 void RenderMeter::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     61RenderBox::LogicalExtentComputedValues RenderMeter::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
    6262{
    63     RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
    64 
     63    auto computedValues = RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
    6564    LayoutRect frame = frameRect();
    6665    if (isHorizontalWritingMode())
    … …  
    7069    IntSize frameSize = theme().meterSizeForBounds(*this, snappedIntRect(frame));
    7170    computedValues.m_extent = isHorizontalWritingMode() ? frameSize.height() : frameSize.width();
     71    return computedValues;
    7272}
    7373

  • trunk/Source/WebCore/rendering/RenderMeter.h

    r208668 r209903  
    4040private:
    4141    void updateLogicalWidth() override;
    42     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     42    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    4343
    4444    const char* renderName() const override { return "RenderMeter"; }

  • trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp

    r209259 r209903  
    500500}
    501501
    502 void RenderMultiColumnFlowThread::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     502RenderBox::LogicalExtentComputedValues RenderMultiColumnFlowThread::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
    503503{
    504504    // We simply remain at our intrinsic height.
    505     computedValues.m_extent = logicalHeight;
    506     computedValues.m_position = logicalTop;
     505    return { logicalHeight, logicalTop, ComputedMarginValues() };
    507506}
    508507

  • trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h

    r208668 r209903  
    114114    void flowThreadRelativeWillBeRemoved(RenderObject&) override;
    115115    void flowThreadDescendantBoxLaidOut(RenderBox*) override;
    116     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     116    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    117117    LayoutUnit initialLogicalWidth() const override;
    118118    void setPageBreak(const RenderBlock*, LayoutUnit offset, LayoutUnit spaceShortage) override;

  • trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp

    r208985 r209903  
    403403}
    404404
    405 void RenderMultiColumnSet::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
    406 {
    407     computedValues.m_extent = m_availableColumnHeight;
    408     computedValues.m_position = logicalTop;
     405RenderBox::LogicalExtentComputedValues RenderMultiColumnSet::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop) const
     406{
     407    return { m_availableColumnHeight, logicalTop, ComputedMarginValues() };
    409408}
    410409

  • trunk/Source/WebCore/rendering/RenderMultiColumnSet.h

    r208668 r209903  
    136136    void layout() override;
    137137
    138     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     138    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    139139
    140140    void paintObject(PaintInfo&, const LayoutPoint&) override { }

  • trunk/Source/WebCore/rendering/RenderProgress.cpp

    r200041 r209903  
    5858}
    5959
    60 void RenderProgress::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     60RenderBox::LogicalExtentComputedValues RenderProgress::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
    6161{
    62     RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
    63 
     62    auto computedValues = RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
    6463    LayoutRect frame = frameRect();
    6564    if (isHorizontalWritingMode())
    … …  
    6968    IntSize frameSize = theme().progressBarRectForBounds(*this, snappedIntRect(frame)).size();
    7069    computedValues.m_extent = isHorizontalWritingMode() ? frameSize.height() : frameSize.width();
     70    return computedValues;
    7171}
    7272

  • trunk/Source/WebCore/rendering/RenderProgress.h

    r208668 r209903  
    4545    bool isProgress() const override { return true; }
    4646    bool requiresForcedStyleRecalcPropagation() const override { return true; }
    47     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     47    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    4848
    4949    void animationTimerFired();

  • trunk/Source/WebCore/rendering/RenderTextControl.cpp

    r200671 r209903  
    9696}
    9797
    98 void RenderTextControl::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     98RenderBox::LogicalExtentComputedValues RenderTextControl::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
    9999{
    100100    TextControlInnerTextElement* innerText = innerTextElement();
    … …  
    110110    }
    111111
    112     RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
     112    return RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
    113113}
    114114

  • trunk/Source/WebCore/rendering/RenderTextControl.h

    r208985 r209903  
    6464    virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const = 0;
    6565
    66     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     66    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    6767    RenderObject* layoutSpecialExcludedChild(bool relayoutChildren) override;
    6868

  • trunk/Source/WebCore/rendering/RenderView.cpp

    r209438 r209903  
    213213}
    214214
    215 void RenderView::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit, LogicalExtentComputedValues& computedValues) const
    216 {
    217     computedValues.m_extent = !shouldUsePrintingLayout() ? LayoutUnit(viewLogicalHeight()) : logicalHeight;
     215RenderBox::LogicalExtentComputedValues RenderView::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit) const
     216{
     217    return { !shouldUsePrintingLayout() ? LayoutUnit(viewLogicalHeight()) : logicalHeight, LayoutUnit(), ComputedMarginValues() };
    218218}
    219219

  • trunk/Source/WebCore/rendering/RenderView.h

    r209438 r209903  
    5858    void layout() override;
    5959    void updateLogicalWidth() override;
    60     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     60    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    6161
    6262    LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const override;

  • trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp

    r208985 r209903  
    123123}
    124124
    125 void RenderSVGForeignObject::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     125RenderBox::LogicalExtentComputedValues RenderSVGForeignObject::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop) const
    126126{
    127127    // FIXME: Investigate in size rounding issues
    128128    // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
    129129    // FIXME: Is this correct for vertical writing mode?
    130     computedValues.m_extent = static_cast<int>(roundf(m_viewport.height()));
    131     computedValues.m_position = logicalTop;
     130    return { static_cast<int>(roundf(m_viewport.height())), logicalTop, ComputedMarginValues() };
    132131}
    133132

  • trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h

    r208668 r209903  
    6363
    6464    void updateLogicalWidth() override;
    65     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     65    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    6666
    6767    const AffineTransform& localToParentTransform() const override;
Note: See TracChangeset for help on using the changeset viewer.