Changeset 128110 in webkit


Ignore:
Timestamp:
Sep 10, 2012 2:47:50 PM (12 years ago)
Author:
tony@chromium.org
Message:

Rename computeLogicalWidth to updateLogicalWidth
​https://bugs.webkit.org/show_bug.cgi?id=96288

Reviewed by Ojan Vafai.

Also rename recomputeLogicalWidth to updateLogicalWidthAndColumnWidth.
Also rename RenderTableCell::updateLogicalWidth to RenderTableCell::setCellLogicalWidth.

No new tests, this is just a refactor.

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::updateLogicalWidthAndColumnWidth):
(WebCore::RenderBlock::layoutBlock):
(WebCore::RenderBlock::layoutPositionedObjects):
(WebCore::RenderBlock::insertFloatingObject):
(WebCore::RenderBlock::getClearDelta):

  • rendering/RenderBlock.h:
  • rendering/RenderBox.cpp:

(WebCore::RenderBox::updateLogicalWidth):

  • rendering/RenderBox.h:

(RenderBox):
(WebCore::RenderBox::tryLayoutDoingPositionedMovementOnly):

  • rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::RenderDeprecatedFlexibleBox::layoutBlock):

  • rendering/RenderEmbeddedObject.cpp:

(WebCore::RenderEmbeddedObject::layout):

  • rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutBlock):

  • rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::layout):
(WebCore::RenderFlowThread::updateLogicalWidth):

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

(WebCore::RenderGrid::layoutBlock):

  • rendering/RenderHTMLCanvas.cpp:

(WebCore::RenderHTMLCanvas::canvasSizeChanged):

  • rendering/RenderIFrame.cpp:

(WebCore::RenderIFrame::updateLogicalWidth):
(WebCore::RenderIFrame::layoutSeamlessly):
(WebCore::RenderIFrame::layout):

  • rendering/RenderIFrame.h:

(RenderIFrame):

  • rendering/RenderImage.cpp:

(WebCore::RenderImage::imageDimensionsChanged):

  • rendering/RenderMeter.cpp:

(WebCore::RenderMeter::updateLogicalWidth):

  • rendering/RenderMeter.h:

(RenderMeter):

  • rendering/RenderMultiColumnBlock.cpp:

(WebCore::RenderMultiColumnBlock::updateLogicalWidthAndColumnWidth):

  • rendering/RenderMultiColumnBlock.h:

(RenderMultiColumnBlock):

  • rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::updateLogicalWidth):

  • rendering/RenderMultiColumnSet.h:

(RenderMultiColumnSet):

  • rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::layout):

  • rendering/RenderTable.cpp:

(WebCore::RenderTable::updateLogicalWidth):
(WebCore::RenderTable::layout):

  • rendering/RenderTable.h:

(RenderTable):

  • rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::updateLogicalWidth):
(WebCore::RenderTableCell::setCellLogicalWidth):

  • rendering/RenderTableCell.h:

(RenderTableCell):

  • rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::setCellLogicalWidths):

  • rendering/RenderView.cpp:

(WebCore::RenderView::updateLogicalWidth):

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

(WebCore::RenderSVGForeignObject::updateLogicalWidth):

  • rendering/svg/RenderSVGForeignObject.h:

(RenderSVGForeignObject):

  • rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::layout):

Location:
trunk/Source/WebCore
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r128109 r128110  
     12012-09-10  Tony Chang  <tony@chromium.org>
     2
     3        Rename computeLogicalWidth to updateLogicalWidth
     4        https://bugs.webkit.org/show_bug.cgi?id=96288
     5
     6        Reviewed by Ojan Vafai.
     7
     8        Also rename recomputeLogicalWidth to updateLogicalWidthAndColumnWidth.
     9        Also rename RenderTableCell::updateLogicalWidth to RenderTableCell::setCellLogicalWidth.
     10
     11        No new tests, this is just a refactor.
     12
     13        * rendering/RenderBlock.cpp:
     14        (WebCore::RenderBlock::updateLogicalWidthAndColumnWidth):
     15        (WebCore::RenderBlock::layoutBlock):
     16        (WebCore::RenderBlock::layoutPositionedObjects):
     17        (WebCore::RenderBlock::insertFloatingObject):
     18        (WebCore::RenderBlock::getClearDelta):
     19        * rendering/RenderBlock.h:
     20        * rendering/RenderBox.cpp:
     21        (WebCore::RenderBox::updateLogicalWidth):
     22        * rendering/RenderBox.h:
     23        (RenderBox):
     24        (WebCore::RenderBox::tryLayoutDoingPositionedMovementOnly):
     25        * rendering/RenderDeprecatedFlexibleBox.cpp:
     26        (WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
     27        * rendering/RenderEmbeddedObject.cpp:
     28        (WebCore::RenderEmbeddedObject::layout):
     29        * rendering/RenderFlexibleBox.cpp:
     30        (WebCore::RenderFlexibleBox::layoutBlock):
     31        * rendering/RenderFlowThread.cpp:
     32        (WebCore::RenderFlowThread::layout):
     33        (WebCore::RenderFlowThread::updateLogicalWidth):
     34        * rendering/RenderFlowThread.h:
     35        * rendering/RenderGrid.cpp:
     36        (WebCore::RenderGrid::layoutBlock):
     37        * rendering/RenderHTMLCanvas.cpp:
     38        (WebCore::RenderHTMLCanvas::canvasSizeChanged):
     39        * rendering/RenderIFrame.cpp:
     40        (WebCore::RenderIFrame::updateLogicalWidth):
     41        (WebCore::RenderIFrame::layoutSeamlessly):
     42        (WebCore::RenderIFrame::layout):
     43        * rendering/RenderIFrame.h:
     44        (RenderIFrame):
     45        * rendering/RenderImage.cpp:
     46        (WebCore::RenderImage::imageDimensionsChanged):
     47        * rendering/RenderMeter.cpp:
     48        (WebCore::RenderMeter::updateLogicalWidth):
     49        * rendering/RenderMeter.h:
     50        (RenderMeter):
     51        * rendering/RenderMultiColumnBlock.cpp:
     52        (WebCore::RenderMultiColumnBlock::updateLogicalWidthAndColumnWidth):
     53        * rendering/RenderMultiColumnBlock.h:
     54        (RenderMultiColumnBlock):
     55        * rendering/RenderMultiColumnSet.cpp:
     56        (WebCore::RenderMultiColumnSet::updateLogicalWidth):
     57        * rendering/RenderMultiColumnSet.h:
     58        (RenderMultiColumnSet):
     59        * rendering/RenderReplaced.cpp:
     60        (WebCore::RenderReplaced::layout):
     61        * rendering/RenderTable.cpp:
     62        (WebCore::RenderTable::updateLogicalWidth):
     63        (WebCore::RenderTable::layout):
     64        * rendering/RenderTable.h:
     65        (RenderTable):
     66        * rendering/RenderTableCell.cpp:
     67        (WebCore::RenderTableCell::updateLogicalWidth):
     68        (WebCore::RenderTableCell::setCellLogicalWidth):
     69        * rendering/RenderTableCell.h:
     70        (RenderTableCell):
     71        * rendering/RenderTableSection.cpp:
     72        (WebCore::RenderTableSection::setCellLogicalWidths):
     73        * rendering/RenderView.cpp:
     74        (WebCore::RenderView::updateLogicalWidth):
     75        * rendering/RenderView.h:
     76        * rendering/svg/RenderSVGForeignObject.cpp:
     77        (WebCore::RenderSVGForeignObject::updateLogicalWidth):
     78        * rendering/svg/RenderSVGForeignObject.h:
     79        (RenderSVGForeignObject):
     80        * rendering/svg/RenderSVGRoot.cpp:
     81        (WebCore::RenderSVGRoot::layout):
     82
    1832012-09-10  Andreas Kling  <kling@webkit.org>
    284

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

    r127509 r128110  
    14161416}
    14171417
    1418 bool RenderBlock::recomputeLogicalWidth()
     1418bool RenderBlock::updateLogicalWidthAndColumnWidth()
    14191419{
    14201420    LayoutUnit oldWidth = logicalWidth();
    14211421    LayoutUnit oldColumnWidth = desiredColumnWidth();
    14221422
    1423     computeLogicalWidth();
     1423    updateLogicalWidth();
    14241424    calcColumnWidth();
    14251425
    … …  
    14691469    LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
    14701470
    1471     if (recomputeLogicalWidth())
     1471    if (updateLogicalWidthAndColumnWidth())
    14721472        relayoutChildren = true;
    14731473
    … …  
    26552655                r->computeLogicalHeight();
    26562656            else
    2657                 r->computeLogicalWidth();
     2657                r->updateLogicalWidth();
    26582658            oldLogicalTop = logicalTopForChild(r);
    26592659        }
    … …  
    37613761        o->layoutIfNeeded();
    37623762    else {
    3763         o->computeLogicalWidth();
     3763        o->updateLogicalWidth();
    37643764        o->computeAndSetBlockDirectionMargins(this);
    37653765    }
    … …  
    46534653
    46544654            child->setLogicalTop(newLogicalTop);
    4655             child->computeLogicalWidth();
     4655            child->updateLogicalWidth();
    46564656            region = regionAtBlockOffset(logicalTopForChild(child));
    46574657            borderBox = child->borderBoxRectInRegion(region, offsetFromLogicalTopOfFirstPage() + logicalTopForChild(child), DoNotCacheRenderBoxRegionInfo);

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

    r127163 r128110  
    10101010    virtual bool requiresColumns(int desiredColumnCount) const;
    10111011
    1012     virtual bool recomputeLogicalWidth();
     1012    virtual bool updateLogicalWidthAndColumnWidth();
    10131013
    10141014    virtual bool canCollapseAnonymousBlockChild() const { return true; }

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

    r127915 r128110  
    16161616}
    16171617
    1618 void RenderBox::computeLogicalWidth()
     1618void RenderBox::updateLogicalWidth()
    16191619{
    16201620    LogicalExtentComputedValues computedValues;

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

    r127914 r128110  
    365365    LayoutUnit perpendicularContainingBlockLogicalHeight() const;
    366366
    367     virtual void computeLogicalWidth();
     367    virtual void updateLogicalWidth();
    368368    virtual void computeLogicalHeight();
    369369    void computeLogicalHeight(LogicalExtentComputedValues&) const;
    … …  
    450450    {
    451451        LayoutUnit oldWidth = width();
    452         computeLogicalWidth();
     452        updateLogicalWidth();
    453453        // If we shrink to fit our width may have changed, so we still need full layout.
    454454        if (oldWidth != width())

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

    r127346 r128110  
    248248    LayoutSize previousSize = size();
    249249
    250     computeLogicalWidth();
     250    updateLogicalWidth();
    251251    computeLogicalHeight();
    252252

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

    r126859 r128110  
    231231    ASSERT(needsLayout());
    232232
    233     computeLogicalWidth();
     233    updateLogicalWidth();
    234234    computeLogicalHeight();
    235235

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

    r126503 r128110  
    255255
    256256    setLogicalHeight(0);
    257     computeLogicalWidth();
     257    updateLogicalWidth();
    258258
    259259    m_overflow.clear();

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

    r127280 r128110  
    167167            }
    168168           
    169             computeLogicalWidth(); // Called to get the maximum logical width for the region.
     169            updateLogicalWidth(); // Called to get the maximum logical width for the region.
    170170           
    171171            LayoutUnit logicalHeight = 0;
    … …  
    197197}
    198198
    199 void RenderFlowThread::computeLogicalWidth()
     199void RenderFlowThread::updateLogicalWidth()
    200200{
    201201    LayoutUnit logicalWidth = 0;

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

    r127937 r128110  
    7474    const RenderRegionList& renderRegionList() const { return m_regionList; }
    7575
    76     virtual void computeLogicalWidth() OVERRIDE;
     76    virtual void updateLogicalWidth() OVERRIDE;
    7777    virtual void computeLogicalHeight() OVERRIDE;
    7878

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

    r124671 r128110  
    7777
    7878    setLogicalHeight(0);
    79     computeLogicalWidth();
     79    updateLogicalWidth();
    8080
    8181    m_overflow.clear();

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

    r111515 r128110  
    9090
    9191    LayoutSize oldSize = size();
    92     computeLogicalWidth();
     92    updateLogicalWidth();
    9393    computeLogicalHeight();
    9494    if (oldSize == size())

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

    r118291 r128110  
    6262}
    6363
    64 void RenderIFrame::computeLogicalWidth()
     64void RenderIFrame::updateLogicalWidth()
    6565{
    6666    // When we're seamless, we behave like a block. Thankfully RenderBox has all the right logic for this.
    6767    if (isSeamless())
    68         return RenderBox::computeLogicalWidth();
    69 
    70     RenderPart::computeLogicalWidth();
     68        return RenderBox::updateLogicalWidth();
     69
     70    RenderPart::updateLogicalWidth();
    7171    if (!flattenFrame())
    7272        return;
    … …  
    163163void RenderIFrame::layoutSeamlessly()
    164164{
    165     computeLogicalWidth();
     165    updateLogicalWidth();
    166166    // FIXME: Containers set their height to 0 before laying out their kids (as we're doing here)
    167167    // however, this causes FrameView::layout() to add vertical scrollbars, incorrectly inflating
    … …  
    191191
    192192    if (flattenFrame()) {
    193         RenderPart::computeLogicalWidth();
     193        RenderPart::updateLogicalWidth();
    194194        RenderPart::computeLogicalHeight();
    195195        layoutWithFlattening(style()->width().isFixed(), style()->height().isFixed());
    … …  
    200200        // Do not return so as to share the layer and overflow updates below.
    201201    } else {
    202         computeLogicalWidth();
     202        updateLogicalWidth();
    203203        // No kids to layout as a replaced element.
    204204        computeLogicalHeight();

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

    r118291 r128110  
    4242private:
    4343    virtual void computeLogicalHeight() OVERRIDE;
    44     virtual void computeLogicalWidth() OVERRIDE;
     44    virtual void updateLogicalWidth() OVERRIDE;
    4545
    4646    virtual LayoutUnit minPreferredLogicalWidth() const OVERRIDE;

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

    r127421 r128110  
    225225        if (!preferredLogicalWidthsDirty())
    226226            setPreferredLogicalWidthsDirty(true);
    227         computeLogicalWidth();
     227        updateLogicalWidth();
    228228        computeLogicalHeight();
    229229

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

    r125659 r128110  
    5353}
    5454
    55 void RenderMeter::computeLogicalWidth()
     55void RenderMeter::updateLogicalWidth()
    5656{
    57     RenderBox::computeLogicalWidth();
     57    RenderBox::updateLogicalWidth();
    5858    setWidth(theme()->meterSizeForBounds(this, pixelSnappedIntRect(frameRect())).width());
    5959}

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

    r127937 r128110  
    4040
    4141private:   
    42     virtual void computeLogicalWidth() OVERRIDE;
     42    virtual void updateLogicalWidth() OVERRIDE;
    4343    virtual void computeLogicalHeight() OVERRIDE;
    4444

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

    r127267 r128110  
    6969}
    7070
    71 bool RenderMultiColumnBlock::recomputeLogicalWidth()
     71bool RenderMultiColumnBlock::updateLogicalWidthAndColumnWidth()
    7272{
    73     bool relayoutChildren = RenderBlock::recomputeLogicalWidth();
     73    bool relayoutChildren = RenderBlock::updateLogicalWidthAndColumnWidth();
    7474    LayoutUnit oldColumnWidth = m_columnWidth;
    7575    computeColumnCountAndWidth();

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

    r126177 r128110  
    5151    virtual const char* renderName() const;
    5252
    53     virtual bool recomputeLogicalWidth() OVERRIDE;
     53    virtual bool updateLogicalWidthAndColumnWidth() OVERRIDE;
    5454    virtual void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight) OVERRIDE;
    5555    virtual bool relayoutForPagination(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogicalHeight, LayoutStateMaintainer&) OVERRIDE;

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

    r127421 r128110  
    5252}
    5353
    54 void RenderMultiColumnSet::computeLogicalWidth()
     54void RenderMultiColumnSet::updateLogicalWidth()
    5555{
    5656    // Our logical width starts off matching the column block itself.

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

    r127297 r128110  
    6363
    6464private:
    65     virtual void computeLogicalWidth() OVERRIDE;
     65    virtual void updateLogicalWidth() OVERRIDE;
    6666    virtual void computeLogicalHeight() OVERRIDE;
    6767

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

    r125050 r128110  
    8686    setHeight(minimumReplacedHeight());
    8787
    88     computeLogicalWidth();
     88    updateLogicalWidth();
    8989    computeLogicalHeight();
    9090

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

    r127812 r128110  
    213213}
    214214
    215 void RenderTable::computeLogicalWidth()
     215void RenderTable::updateLogicalWidth()
    216216{
    217217    recalcSectionsIfNeeded();
    … …  
    347347   
    348348    LayoutUnit oldLogicalWidth = logicalWidth();
    349     computeLogicalWidth();
     349    updateLogicalWidth();
    350350
    351351    if (logicalWidth() != oldLogicalWidth) {

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

    r127937 r128110  
    262262    virtual void setCellLogicalWidths();
    263263
    264     virtual void computeLogicalWidth() OVERRIDE;
     264    virtual void updateLogicalWidth() OVERRIDE;
    265265
    266266    LayoutUnit convertStyleLogicalWidthToComputedWidth(const Length& styleLogicalWidth, LayoutUnit availableWidth);

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

    r126590 r128110  
    169169}
    170170
    171 void RenderTableCell::computeLogicalWidth()
    172 {
    173 }
    174 
    175 void RenderTableCell::updateLogicalWidth(LayoutUnit w)
     171void RenderTableCell::updateLogicalWidth()
     172{
     173}
     174
     175void RenderTableCell::setCellLogicalWidth(LayoutUnit w)
    176176{
    177177    if (w == logicalWidth())

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

    r127937 r128110  
    7777    virtual void computePreferredLogicalWidths();
    7878
    79     void updateLogicalWidth(LayoutUnit);
     79    void setCellLogicalWidth(LayoutUnit);
    8080
    8181    virtual int borderLeft() const;
    … …  
    176176    virtual void willBeRemovedFromTree() OVERRIDE;
    177177
    178     virtual void computeLogicalWidth() OVERRIDE;
     178    virtual void updateLogicalWidth() OVERRIDE;
    179179
    180180    virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);

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

    r127538 r128110  
    295295                    cell->repaint();
    296296                }
    297                 cell->updateLogicalWidth(w);
     297                cell->setCellLogicalWidth(w);
    298298            }
    299299        }

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

    r127783 r128110  
    9797}
    9898
    99 void RenderView::computeLogicalWidth()
     99void RenderView::updateLogicalWidth()
    100100{
    101101    if (!shouldUsePrintingLayout() && m_frameView)

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

    r127783 r128110  
    5959
    6060    virtual void layout() OVERRIDE;
    61     virtual void computeLogicalWidth() OVERRIDE;
     61    virtual void updateLogicalWidth() OVERRIDE;
    6262    virtual void computeLogicalHeight() OVERRIDE;
    6363    // FIXME: This override is not needed and should be removed

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

    r126859 r128110  
    106106}
    107107
    108 void RenderSVGForeignObject::computeLogicalWidth()
     108void RenderSVGForeignObject::updateLogicalWidth()
    109109{
    110110    // FIXME: Investigate in size rounding issues

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

    r127937 r128110  
    6060
    6161private:
    62     virtual void computeLogicalWidth() OVERRIDE;
     62    virtual void updateLogicalWidth() OVERRIDE;
    6363    virtual void computeLogicalHeight() OVERRIDE;
    6464

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

    r127421 r128110  
    230230
    231231    LayoutSize oldSize = size();
    232     computeLogicalWidth();
     232    updateLogicalWidth();
    233233    computeLogicalHeight();
    234234    buildLocalToBorderBoxTransform();
Note: See TracChangeset for help on using the changeset viewer.