Changeset 128201 in webkit


Ignore:
Timestamp:
Sep 11, 2012 10:21:57 AM (12 years ago)
Author:
tony@chromium.org
Message:

Rename computeLogicalHeight to updateLogicalHeight
​https://bugs.webkit.org/show_bug.cgi?id=96305

Reviewed by Ojan Vafai.

computeLogicalHeight changes the value of 4 member variables of the
render box, so give it a name that makes it more clear that it is
updating member variables.

No new tests, this is just a refactor.

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeInitialRegionRangeForBlock):
(WebCore::RenderBlock::checkForPaginationLogicalHeightChange):
(WebCore::RenderBlock::layoutBlock):
(WebCore::RenderBlock::layoutPositionedObjects):
(WebCore::RenderBlock::computeBlockPreferredLogicalWidths):

  • rendering/RenderBox.cpp:

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

  • rendering/RenderBox.h:

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

  • rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
(WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
(WebCore::RenderDeprecatedFlexibleBox::layoutVerticalBox):

  • rendering/RenderEmbeddedObject.cpp:

(WebCore::RenderEmbeddedObject::layout):

  • rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutBlock):
(WebCore::RenderFlexibleBox::layoutAndPlaceChildren):

  • rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::updateLogicalHeight):

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

(WebCore::RenderGrid::layoutBlock):

  • rendering/RenderHTMLCanvas.cpp:

(WebCore::RenderHTMLCanvas::canvasSizeChanged):

  • rendering/RenderIFrame.cpp:

(WebCore::RenderIFrame::updateLogicalHeight):
(WebCore::RenderIFrame::layoutSeamlessly):
(WebCore::RenderIFrame::layout):

  • rendering/RenderIFrame.h:

(RenderIFrame):

  • rendering/RenderImage.cpp:

(WebCore::RenderImage::imageDimensionsChanged):

  • rendering/RenderListBox.cpp:

(WebCore::RenderListBox::updateLogicalHeight):

  • rendering/RenderListBox.h:

(RenderListBox):

  • rendering/RenderMeter.cpp:

(WebCore::RenderMeter::updateLogicalHeight):

  • rendering/RenderMeter.h:

(RenderMeter):

  • rendering/RenderMultiColumnBlock.cpp:

(WebCore::RenderMultiColumnBlock::checkForPaginationLogicalHeightChange):

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

(WebCore::RenderMultiColumnSet::updateLogicalHeight):

  • rendering/RenderMultiColumnSet.h:

(RenderMultiColumnSet):

  • rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::layout):

  • rendering/RenderSearchField.cpp:

(WebCore::RenderSearchField::computeControlHeight):

  • rendering/RenderTable.cpp:

(WebCore::RenderTable::layout):

  • rendering/RenderTextControl.cpp:

(WebCore::RenderTextControl::updateLogicalHeight):

  • rendering/RenderTextControl.h:

(RenderTextControl):

  • rendering/RenderView.cpp:

(WebCore::RenderView::updateLogicalHeight):

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

(WebCore::RenderSVGForeignObject::updateLogicalHeight):

  • 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

    r128196 r128201  
     12012-09-11  Tony Chang  <tony@chromium.org>
     2
     3        Rename computeLogicalHeight to updateLogicalHeight
     4        https://bugs.webkit.org/show_bug.cgi?id=96305
     5
     6        Reviewed by Ojan Vafai.
     7
     8        computeLogicalHeight changes the value of 4 member variables of the
     9        render box, so give it a name that makes it more clear that it is
     10        updating member variables.
     11
     12        No new tests, this is just a refactor.
     13
     14        * rendering/RenderBlock.cpp:
     15        (WebCore::RenderBlock::computeInitialRegionRangeForBlock):
     16        (WebCore::RenderBlock::checkForPaginationLogicalHeightChange):
     17        (WebCore::RenderBlock::layoutBlock):
     18        (WebCore::RenderBlock::layoutPositionedObjects):
     19        (WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
     20        * rendering/RenderBox.cpp:
     21        (WebCore::RenderBox::updateLogicalHeight):
     22        (WebCore::RenderBox::computePercentageLogicalHeight):
     23        (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
     24        (WebCore::RenderBox::availableLogicalHeightUsing):
     25        * rendering/RenderBox.h:
     26        (RenderBox):
     27        (WebCore::RenderBox::tryLayoutDoingPositionedMovementOnly):
     28        * rendering/RenderDeprecatedFlexibleBox.cpp:
     29        (WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
     30        (WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
     31        (WebCore::RenderDeprecatedFlexibleBox::layoutVerticalBox):
     32        * rendering/RenderEmbeddedObject.cpp:
     33        (WebCore::RenderEmbeddedObject::layout):
     34        * rendering/RenderFlexibleBox.cpp:
     35        (WebCore::RenderFlexibleBox::layoutBlock):
     36        (WebCore::RenderFlexibleBox::layoutAndPlaceChildren):
     37        * rendering/RenderFlowThread.cpp:
     38        (WebCore::RenderFlowThread::updateLogicalHeight):
     39        * rendering/RenderFlowThread.h:
     40        * rendering/RenderGrid.cpp:
     41        (WebCore::RenderGrid::layoutBlock):
     42        * rendering/RenderHTMLCanvas.cpp:
     43        (WebCore::RenderHTMLCanvas::canvasSizeChanged):
     44        * rendering/RenderIFrame.cpp:
     45        (WebCore::RenderIFrame::updateLogicalHeight):
     46        (WebCore::RenderIFrame::layoutSeamlessly):
     47        (WebCore::RenderIFrame::layout):
     48        * rendering/RenderIFrame.h:
     49        (RenderIFrame):
     50        * rendering/RenderImage.cpp:
     51        (WebCore::RenderImage::imageDimensionsChanged):
     52        * rendering/RenderListBox.cpp:
     53        (WebCore::RenderListBox::updateLogicalHeight):
     54        * rendering/RenderListBox.h:
     55        (RenderListBox):
     56        * rendering/RenderMeter.cpp:
     57        (WebCore::RenderMeter::updateLogicalHeight):
     58        * rendering/RenderMeter.h:
     59        (RenderMeter):
     60        * rendering/RenderMultiColumnBlock.cpp:
     61        (WebCore::RenderMultiColumnBlock::checkForPaginationLogicalHeightChange):
     62        * rendering/RenderMultiColumnFlowThread.h:
     63        * rendering/RenderMultiColumnSet.cpp:
     64        (WebCore::RenderMultiColumnSet::updateLogicalHeight):
     65        * rendering/RenderMultiColumnSet.h:
     66        (RenderMultiColumnSet):
     67        * rendering/RenderReplaced.cpp:
     68        (WebCore::RenderReplaced::layout):
     69        * rendering/RenderSearchField.cpp:
     70        (WebCore::RenderSearchField::computeControlHeight):
     71        * rendering/RenderTable.cpp:
     72        (WebCore::RenderTable::layout):
     73        * rendering/RenderTextControl.cpp:
     74        (WebCore::RenderTextControl::updateLogicalHeight):
     75        * rendering/RenderTextControl.h:
     76        (RenderTextControl):
     77        * rendering/RenderView.cpp:
     78        (WebCore::RenderView::updateLogicalHeight):
     79        * rendering/RenderView.h:
     80        * rendering/svg/RenderSVGForeignObject.cpp:
     81        (WebCore::RenderSVGForeignObject::updateLogicalHeight):
     82        * rendering/svg/RenderSVGForeignObject.h:
     83        (RenderSVGForeignObject):
     84        * rendering/svg/RenderSVGRoot.cpp:
     85        (WebCore::RenderSVGRoot::layout):
     86
    1872012-09-11  Zach Kuznia  <zork@chromium.org>
    288

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

    r128130 r128201  
    14031403        LayoutUnit oldLogicalTop = logicalTop();
    14041404        setLogicalHeight(MAX_LAYOUT_UNIT / 2);
    1405         computeLogicalHeight();
     1405        updateLogicalHeight();
    14061406        enclosingRenderFlowThread()->setRegionRangeForBox(this, offsetFromLogicalTopOfFirstPage());
    14071407        setLogicalHeight(oldHeight);
    … …  
    14341434            // We need to go ahead and set our explicit page height if one exists, so that we can
    14351435            // avoid doing two layout passes.
    1436             computeLogicalHeight();
     1436            updateLogicalHeight();
    14371437            LayoutUnit columnHeight = contentLogicalHeight();
    14381438            if (columnHeight > ZERO_LAYOUT_UNIT) {
    … …  
    15471547    LayoutUnit oldHeight = logicalHeight();
    15481548    LayoutUnit oldClientAfterEdge = clientLogicalBottom();
    1549     computeLogicalHeight();
     1549    updateLogicalHeight();
    15501550    LayoutUnit newHeight = logicalHeight();
    15511551    if (oldHeight != newHeight) {
    … …  
    26532653        if (needsBlockDirectionLocationSetBeforeLayout) {
    26542654            if (isHorizontalWritingMode() == r->isHorizontalWritingMode())
    2655                 r->computeLogicalHeight();
     2655                r->updateLogicalHeight();
    26562656            else
    26572657                r->updateLogicalWidth();
    … …  
    60586058            LayoutUnit oldHeight = childBox->logicalHeight();
    60596059            childBox->setLogicalHeight(childBox->borderAndPaddingLogicalHeight());
    6060             childBox->computeLogicalHeight();
     6060            childBox->updateLogicalHeight();
    60616061            childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = childBox->logicalHeight();
    60626062            childBox->setLogicalHeight(oldHeight);

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

    r128155 r128201  
    19621962}
    19631963
    1964 void RenderBox::computeLogicalHeight()
     1964void RenderBox::updateLogicalHeight()
    19651965{
    19661966    LogicalExtentComputedValues computedValues;
    … …  
    21822182        // can get called while the block is still laying out its kids.
    21832183        LayoutUnit oldHeight = cb->logicalHeight();
    2184         cb->computeLogicalHeight();
     2184        cb->updateLogicalHeight();
    21852185        result = cb->contentLogicalHeight();
    21862186        cb->setLogicalHeight(oldHeight);
    … …  
    22772277                RenderBlock* block = toRenderBlock(cb);
    22782278                LayoutUnit oldHeight = block->height();
    2279                 block->computeLogicalHeight();
     2279                block->updateLogicalHeight();
    22802280                LayoutUnit newHeight = block->adjustContentBoxLogicalHeightForBoxSizing(block->contentHeight());
    22812281                block->setHeight(oldHeight);
    … …  
    23482348        RenderBlock* block = const_cast<RenderBlock*>(toRenderBlock(this));
    23492349        LayoutUnit oldHeight = block->logicalHeight();
    2350         block->computeLogicalHeight();
     2350        block->updateLogicalHeight();
    23512351        LayoutUnit newHeight = block->adjustContentBoxLogicalHeightForBoxSizing(block->contentLogicalHeight());
    23522352        block->setLogicalHeight(oldHeight);

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

    r128130 r128201  
    366366
    367367    virtual void updateLogicalWidth();
    368     virtual void computeLogicalHeight();
     368    virtual void updateLogicalHeight();
    369369    void computeLogicalHeight(LogicalExtentComputedValues&) const;
    370370
    … …  
    454454        if (oldWidth != width())
    455455            return false;
    456         computeLogicalHeight();
     456        updateLogicalHeight();
    457457        return true;
    458458    }

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

    r128130 r128201  
    249249
    250250    updateLogicalWidth();
    251     computeLogicalHeight();
     251    updateLogicalHeight();
    252252
    253253    m_overflow.clear();
    … …  
    270270
    271271    LayoutUnit oldClientAfterEdge = clientLogicalBottom();
    272     computeLogicalHeight();
     272    updateLogicalHeight();
    273273
    274274    if (previousSize.height() != height())
    … …  
    415415
    416416        oldHeight = height();
    417         computeLogicalHeight();
     417        updateLogicalHeight();
    418418
    419419        relayoutChildren = false;
    … …  
    448448            // Now do a layout.
    449449            LayoutUnit oldChildHeight = child->height();
    450             child->computeLogicalHeight();
     450            child->updateLogicalHeight();
    451451            if (oldChildHeight != child->height())
    452452                child->setChildNeedsLayout(true, MarkOnlyThis);
    … …  
    736736        // Now we have to calc our height, so we know how much space we have remaining.
    737737        oldHeight = height();
    738         computeLogicalHeight();
     738        updateLogicalHeight();
    739739        if (oldHeight != height())
    740740            heightSpecified = true;

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

    r128110 r128201  
    232232
    233233    updateLogicalWidth();
    234     computeLogicalHeight();
     234    updateLogicalHeight();
    235235
    236236    RenderPart::layout();

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

    r128130 r128201  
    266266
    267267    LayoutUnit oldClientAfterEdge = clientLogicalBottom();
    268     computeLogicalHeight();
     268    updateLogicalHeight();
    269269    repositionLogicalHeightDependentFlexItems(*m_orderIterator, lineContexts, oldClientAfterEdge);
    270270
    … …  
    10591059        // We have to do an extra pass for column-reverse to reposition the flex items since the start depends
    10601060        // on the height of the flexbox, which we only know after we've positioned all the flex items.
    1061         computeLogicalHeight();
     1061        updateLogicalHeight();
    10621062        layoutColumnReverse(children, childSizes, crossAxisOffset, availableFreeSpace);
    10631063    }

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

    r128110 r128201  
    223223}
    224224
    225 void RenderFlowThread::computeLogicalHeight()
     225void RenderFlowThread::updateLogicalHeight()
    226226{
    227227    LayoutUnit logicalHeight = 0;

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

    r128110 r128201  
    7575
    7676    virtual void updateLogicalWidth() OVERRIDE;
    77     virtual void computeLogicalHeight() OVERRIDE;
     77    virtual void updateLogicalHeight() OVERRIDE;
    7878
    7979    void paintFlowThreadPortionInRegion(PaintInfo&, RenderRegion*, LayoutRect flowThreadPortionRect, LayoutRect flowThreadPortionOverflowRect, const LayoutPoint&) const;

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

    r128110 r128201  
    8484
    8585    LayoutUnit oldClientAfterEdge = clientLogicalBottom();
    86     computeLogicalHeight();
     86    updateLogicalHeight();
    8787
    8888    if (size() != previousSize)

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

    r128110 r128201  
    9191    LayoutSize oldSize = size();
    9292    updateLogicalWidth();
    93     computeLogicalHeight();
     93    updateLogicalHeight();
    9494    if (oldSize == size())
    9595        return;

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

    r128110 r128201  
    4444}
    4545
    46 void RenderIFrame::computeLogicalHeight()
    47 {
    48     RenderPart::computeLogicalHeight();
     46void RenderIFrame::updateLogicalHeight()
     47{
     48    RenderPart::updateLogicalHeight();
    4949    if (!flattenFrame())
    5050         return;
    … …  
    176176    if (childFrameView) // Widget should never be null during layout(), but just in case.
    177177        setLogicalHeight(childFrameView->contentsHeight() + borderTop() + borderBottom());
    178     computeLogicalHeight();
     178    updateLogicalHeight();
    179179
    180180    updateWidgetPosition(); // Notify the Widget of our final height.
    … …  
    192192    if (flattenFrame()) {
    193193        RenderPart::updateLogicalWidth();
    194         RenderPart::computeLogicalHeight();
     194        RenderPart::updateLogicalHeight();
    195195        layoutWithFlattening(style()->width().isFixed(), style()->height().isFixed());
    196196        // FIXME: Is early return really OK here? What about transform/overflow code below?
    … …  
    202202        updateLogicalWidth();
    203203        // No kids to layout as a replaced element.
    204         computeLogicalHeight();
     204        updateLogicalHeight();
    205205    }
    206206

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

    r128110 r128201  
    4141
    4242private:
    43     virtual void computeLogicalHeight() OVERRIDE;
    4443    virtual void updateLogicalWidth() OVERRIDE;
     44    virtual void updateLogicalHeight() OVERRIDE;
    4545
    4646    virtual LayoutUnit minPreferredLogicalWidth() const OVERRIDE;

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

    r128110 r128201  
    226226            setPreferredLogicalWidthsDirty(true);
    227227        updateLogicalWidth();
    228         computeLogicalHeight();
     228        updateLogicalHeight();
    229229
    230230        if (imageSizeChanged || width() != oldwidth || height() != oldheight) {

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

    r128134 r128201  
    251251}
    252252
    253 void RenderListBox::computeLogicalHeight()
     253void RenderListBox::updateLogicalHeight()
    254254{
    255255    int toAdd = borderAndPaddingHeight();
    … …  
    258258    setHeight(itemHeight * size() - rowSpacing + toAdd);
    259259   
    260     RenderBlock::computeLogicalHeight();
     260    RenderBlock::updateLogicalHeight();
    261261   
    262262    if (m_vBar) {

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

    r128134 r128201  
    7878    virtual void computePreferredLogicalWidths();
    7979    virtual LayoutUnit baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
    80     virtual void computeLogicalHeight() OVERRIDE;
     80    virtual void updateLogicalHeight() OVERRIDE;
    8181
    8282    virtual void layout();

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

    r128110 r128201  
    5959}
    6060
    61 void RenderMeter::computeLogicalHeight()
     61void RenderMeter::updateLogicalHeight()
    6262{
    63     RenderBox::computeLogicalHeight();
     63    RenderBox::updateLogicalHeight();
    6464    setHeight(theme()->meterSizeForBounds(this, pixelSnappedIntRect(frameRect())).height());
    6565}

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

    r128110 r128201  
    4141private:   
    4242    virtual void updateLogicalWidth() OVERRIDE;
    43     virtual void computeLogicalHeight() OVERRIDE;
     43    virtual void updateLogicalHeight() OVERRIDE;
    4444
    4545    virtual const char* renderName() const { return "RenderMeter"; }

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

    r128110 r128201  
    8282{
    8383    // We don't actually update any of the variables. We just subclassed to adjust our column height.
    84     computeLogicalHeight();
     84    updateLogicalHeight();
    8585    LayoutUnit newContentLogicalHeight = contentLogicalHeight();
    8686    if (newContentLogicalHeight > ZERO_LAYOUT_UNIT) {

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

    r126602 r128201  
    4040    virtual const char* renderName() const OVERRIDE;
    4141   
    42     virtual void computeLogicalHeight() OVERRIDE {}; // We simply remain at our intrinsic height.
     42    virtual void updateLogicalHeight() OVERRIDE { } // We simply remain at our intrinsic height.
    4343};
    4444

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

    r128110 r128201  
    6565}
    6666
    67 void RenderMultiColumnSet::computeLogicalHeight()
     67void RenderMultiColumnSet::updateLogicalHeight()
    6868{
    6969    // Make sure our column height is up to date.

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

    r128110 r128201  
    6464private:
    6565    virtual void updateLogicalWidth() OVERRIDE;
    66     virtual void computeLogicalHeight() OVERRIDE;
     66    virtual void updateLogicalHeight() OVERRIDE;
    6767
    6868    virtual void paintReplaced(PaintInfo&, const LayoutPoint& paintOffset) OVERRIDE;

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

    r128110 r128201  
    8787
    8888    updateLogicalWidth();
    89     computeLogicalHeight();
     89    updateLogicalHeight();
    9090
    9191    m_overflow.clear();

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

    r120569 r128201  
    152152    HTMLElement* resultsButton = resultsButtonElement();
    153153    if (RenderBox* resultsRenderer = resultsButton ? resultsButton->renderBox() : 0) {
    154         resultsRenderer->computeLogicalHeight();
     154        resultsRenderer->updateLogicalHeight();
    155155        nonContentHeight = max(nonContentHeight, resultsRenderer->borderAndPaddingHeight() + resultsRenderer->marginHeight());
    156156        lineHeight = max(lineHeight, resultsRenderer->height());
    … …  
    158158    HTMLElement* cancelButton = cancelButtonElement();
    159159    if (RenderBox* cancelRenderer = cancelButton ? cancelButton->renderBox() : 0) {
    160         cancelRenderer->computeLogicalHeight();
     160        cancelRenderer->updateLogicalHeight();
    161161        nonContentHeight = max(nonContentHeight, cancelRenderer->borderAndPaddingHeight() + cancelRenderer->marginHeight());
    162162        lineHeight = max(lineHeight, cancelRenderer->height());

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

    r128110 r128201  
    408408
    409409    if (!isOutOfFlowPositioned())
    410         computeLogicalHeight();
     410        updateLogicalHeight();
    411411
    412412    Length logicalHeightLength = style()->logicalHeight();
    … …  
    460460
    461461    if (isOutOfFlowPositioned())
    462         computeLogicalHeight();
     462        updateLogicalHeight();
    463463
    464464    // table can be containing block of positioned elements.

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

    r128130 r128201  
    145145}
    146146
    147 void RenderTextControl::computeLogicalHeight()
     147void RenderTextControl::updateLogicalHeight()
    148148{
    149149    HTMLElement* innerText = innerTextElement();
    … …  
    158158    }
    159159
    160     RenderBlock::computeLogicalHeight();
     160    RenderBlock::updateLogicalHeight();
    161161}
    162162

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

    r127937 r128201  
    6363
    6464    virtual void updateFromElement();
    65     virtual void computeLogicalHeight() OVERRIDE;
     65    virtual void updateLogicalHeight() OVERRIDE;
    6666    virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren);
    6767

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

    r128110 r128201  
    9191}
    9292
    93 void RenderView::computeLogicalHeight()
     93void RenderView::updateLogicalHeight()
    9494{
    9595    if (!shouldUsePrintingLayout() && m_frameView)

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

    r128110 r128201  
    6060    virtual void layout() OVERRIDE;
    6161    virtual void updateLogicalWidth() OVERRIDE;
    62     virtual void computeLogicalHeight() OVERRIDE;
     62    virtual void updateLogicalHeight() OVERRIDE;
    6363    // FIXME: This override is not needed and should be removed
    6464    // it only exists to make computePreferredLogicalWidths public.

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

    r128110 r128201  
    113113}
    114114
    115 void RenderSVGForeignObject::computeLogicalHeight()
     115void RenderSVGForeignObject::updateLogicalHeight()
    116116{
    117117    // FIXME: Investigate in size rounding issues

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

    r128110 r128201  
    6161private:
    6262    virtual void updateLogicalWidth() OVERRIDE;
    63     virtual void computeLogicalHeight() OVERRIDE;
     63    virtual void updateLogicalHeight() OVERRIDE;
    6464
    6565    virtual const AffineTransform& localToParentTransform() const;

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

    r128110 r128201  
    231231    LayoutSize oldSize = size();
    232232    updateLogicalWidth();
    233     computeLogicalHeight();
     233    updateLogicalHeight();
    234234    buildLocalToBorderBoxTransform();
    235235
Note: See TracChangeset for help on using the changeset viewer.