Rename computeLogicalWidth to updateLogicalWidth
authortony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Sep 2012 21:47:50 +0000 (21:47 +0000)
committertony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Sep 2012 21:47:50 +0000 (21:47 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@128110 268f45cc-cd09-0410-ab3c-d52691b4dbfc

32 files changed:
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.cpp
Source/WebCore/rendering/RenderBlock.h
Source/WebCore/rendering/RenderBox.cpp
Source/WebCore/rendering/RenderBox.h
Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
Source/WebCore/rendering/RenderEmbeddedObject.cpp
Source/WebCore/rendering/RenderFlexibleBox.cpp
Source/WebCore/rendering/RenderFlowThread.cpp
Source/WebCore/rendering/RenderFlowThread.h
Source/WebCore/rendering/RenderGrid.cpp
Source/WebCore/rendering/RenderHTMLCanvas.cpp
Source/WebCore/rendering/RenderIFrame.cpp
Source/WebCore/rendering/RenderIFrame.h
Source/WebCore/rendering/RenderImage.cpp
Source/WebCore/rendering/RenderMeter.cpp
Source/WebCore/rendering/RenderMeter.h
Source/WebCore/rendering/RenderMultiColumnBlock.cpp
Source/WebCore/rendering/RenderMultiColumnBlock.h
Source/WebCore/rendering/RenderMultiColumnSet.cpp
Source/WebCore/rendering/RenderMultiColumnSet.h
Source/WebCore/rendering/RenderReplaced.cpp
Source/WebCore/rendering/RenderTable.cpp
Source/WebCore/rendering/RenderTable.h
Source/WebCore/rendering/RenderTableCell.cpp
Source/WebCore/rendering/RenderTableCell.h
Source/WebCore/rendering/RenderTableSection.cpp
Source/WebCore/rendering/RenderView.cpp
Source/WebCore/rendering/RenderView.h
Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp
Source/WebCore/rendering/svg/RenderSVGForeignObject.h
Source/WebCore/rendering/svg/RenderSVGRoot.cpp

index 27724c5..0680495 100644 (file)
@@ -1,3 +1,85 @@
+2012-09-10  Tony Chang  <tony@chromium.org>
+
+        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):
+
 2012-09-10  Andreas Kling  <kling@webkit.org>
 
         ElementAttributeData: Use subclasses to manage varying object layouts.
index 10216bc..d9c8d50 100755 (executable)
@@ -1415,12 +1415,12 @@ void RenderBlock::computeRegionRangeForBlock()
         enclosingRenderFlowThread()->setRegionRangeForBox(this, offsetFromLogicalTopOfFirstPage());
 }
 
-bool RenderBlock::recomputeLogicalWidth()
+bool RenderBlock::updateLogicalWidthAndColumnWidth()
 {
     LayoutUnit oldWidth = logicalWidth();
     LayoutUnit oldColumnWidth = desiredColumnWidth();
 
-    computeLogicalWidth();
+    updateLogicalWidth();
     calcColumnWidth();
 
     return oldWidth != logicalWidth() || oldColumnWidth != desiredColumnWidth();
@@ -1468,7 +1468,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeigh
 
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
 
-    if (recomputeLogicalWidth())
+    if (updateLogicalWidthAndColumnWidth())
         relayoutChildren = true;
 
     m_overflow.clear();
@@ -2654,7 +2654,7 @@ void RenderBlock::layoutPositionedObjects(bool relayoutChildren)
             if (isHorizontalWritingMode() == r->isHorizontalWritingMode())
                 r->computeLogicalHeight();
             else
-                r->computeLogicalWidth();
+                r->updateLogicalWidth();
             oldLogicalTop = logicalTopForChild(r);
         }
         
@@ -3760,7 +3760,7 @@ RenderBlock::FloatingObject* RenderBlock::insertFloatingObject(RenderBox* o)
     if (!needsBlockDirectionLocationSetBeforeLayout || isWritingModeRoot()) // We are unsplittable if we're a block flow root.
         o->layoutIfNeeded();
     else {
-        o->computeLogicalWidth();
+        o->updateLogicalWidth();
         o->computeAndSetBlockDirectionMargins(this);
     }
     setLogicalWidthForFloat(newObj, logicalWidthForChild(o) + marginStartForChild(o) + marginEndForChild(o));
@@ -4652,7 +4652,7 @@ LayoutUnit RenderBlock::getClearDelta(RenderBox* child, LayoutUnit logicalTop)
             LayoutUnit childOldLogicalTop = child->logicalTop();
 
             child->setLogicalTop(newLogicalTop);
-            child->computeLogicalWidth();
+            child->updateLogicalWidth();
             region = regionAtBlockOffset(logicalTopForChild(child));
             borderBox = child->borderBoxRectInRegion(region, offsetFromLogicalTopOfFirstPage() + logicalTopForChild(child), DoNotCacheRenderBoxRegionInfo);
             LayoutUnit childLogicalWidthAtNewLogicalTopOffset = isHorizontalWritingMode() ? borderBox.width() : borderBox.height();
index a33eeaf..a54a4b8 100644 (file)
@@ -1009,7 +1009,7 @@ protected:
 
     virtual bool requiresColumns(int desiredColumnCount) const;
 
-    virtual bool recomputeLogicalWidth();
+    virtual bool updateLogicalWidthAndColumnWidth();
 
     virtual bool canCollapseAnonymousBlockChild() const { return true; }
 
index 792b9c2..01723e4 100644 (file)
@@ -1615,7 +1615,7 @@ void RenderBox::repaintDuringLayoutIfMoved(const LayoutRect& oldRect)
     }
 }
 
-void RenderBox::computeLogicalWidth()
+void RenderBox::updateLogicalWidth()
 {
     LogicalExtentComputedValues computedValues;
     computeLogicalWidthInRegion(computedValues);
index ed70a94..d792778 100644 (file)
@@ -364,7 +364,7 @@ public:
     LayoutUnit containingBlockAvailableLineWidthInRegion(RenderRegion*, LayoutUnit offsetFromLogicalTopOfFirstPage) const;
     LayoutUnit perpendicularContainingBlockLogicalHeight() const;
 
-    virtual void computeLogicalWidth();
+    virtual void updateLogicalWidth();
     virtual void computeLogicalHeight();
     void computeLogicalHeight(LogicalExtentComputedValues&) const;
 
@@ -449,7 +449,7 @@ public:
     bool tryLayoutDoingPositionedMovementOnly()
     {
         LayoutUnit oldWidth = width();
-        computeLogicalWidth();
+        updateLogicalWidth();
         // If we shrink to fit our width may have changed, so we still need full layout.
         if (oldWidth != width())
             return false;
index e2fe1cf..8bcd1e9 100644 (file)
@@ -247,7 +247,7 @@ void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren, LayoutUnit)
 
     LayoutSize previousSize = size();
 
-    computeLogicalWidth();
+    updateLogicalWidth();
     computeLogicalHeight();
 
     m_overflow.clear();
index dcb3cc3..83d6a1f 100644 (file)
@@ -230,7 +230,7 @@ void RenderEmbeddedObject::layout()
 {
     ASSERT(needsLayout());
 
-    computeLogicalWidth();
+    updateLogicalWidth();
     computeLogicalHeight();
 
     RenderPart::layout();
index 9f87cf8..a92e06d 100644 (file)
@@ -254,7 +254,7 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren, LayoutUnit)
     LayoutSize previousSize = size();
 
     setLogicalHeight(0);
-    computeLogicalWidth();
+    updateLogicalWidth();
 
     m_overflow.clear();
 
index 059ff48..eabb4a7 100644 (file)
@@ -166,7 +166,7 @@ void RenderFlowThread::layout()
                 previousRegionLogicalWidth = regionLogicalWidth;
             }
             
-            computeLogicalWidth(); // Called to get the maximum logical width for the region.
+            updateLogicalWidth(); // Called to get the maximum logical width for the region.
             
             LayoutUnit logicalHeight = 0;
             for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
@@ -196,7 +196,7 @@ void RenderFlowThread::layout()
         dispatchRegionLayoutUpdateEvent();
 }
 
-void RenderFlowThread::computeLogicalWidth()
+void RenderFlowThread::updateLogicalWidth()
 {
     LayoutUnit logicalWidth = 0;
     for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
index 32803ad..ac0d988 100644 (file)
@@ -73,7 +73,7 @@ public:
     virtual void removeRegionFromThread(RenderRegion*);
     const RenderRegionList& renderRegionList() const { return m_regionList; }
 
-    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void updateLogicalWidth() OVERRIDE;
     virtual void computeLogicalHeight() OVERRIDE;
 
     void paintFlowThreadPortionInRegion(PaintInfo&, RenderRegion*, LayoutRect flowThreadPortionRect, LayoutRect flowThreadPortionOverflowRect, const LayoutPoint&) const;
index 6a4519d..5a813c1 100644 (file)
@@ -76,7 +76,7 @@ void RenderGrid::layoutBlock(bool relayoutChildren, LayoutUnit)
     LayoutSize previousSize = size();
 
     setLogicalHeight(0);
-    computeLogicalWidth();
+    updateLogicalWidth();
 
     m_overflow.clear();
 
index 3311698..3a2b75b 100644 (file)
@@ -89,7 +89,7 @@ void RenderHTMLCanvas::canvasSizeChanged()
         setPreferredLogicalWidthsDirty(true);
 
     LayoutSize oldSize = size();
-    computeLogicalWidth();
+    updateLogicalWidth();
     computeLogicalHeight();
     if (oldSize == size())
         return;
index 42480a0..739eba2 100644 (file)
@@ -61,13 +61,13 @@ void RenderIFrame::computeLogicalHeight()
     }
 }
 
-void RenderIFrame::computeLogicalWidth()
+void RenderIFrame::updateLogicalWidth()
 {
     // When we're seamless, we behave like a block. Thankfully RenderBox has all the right logic for this.
     if (isSeamless())
-        return RenderBox::computeLogicalWidth();
+        return RenderBox::updateLogicalWidth();
 
-    RenderPart::computeLogicalWidth();
+    RenderPart::updateLogicalWidth();
     if (!flattenFrame())
         return;
 
@@ -162,7 +162,7 @@ bool RenderIFrame::flattenFrame() const
 
 void RenderIFrame::layoutSeamlessly()
 {
-    computeLogicalWidth();
+    updateLogicalWidth();
     // FIXME: Containers set their height to 0 before laying out their kids (as we're doing here)
     // however, this causes FrameView::layout() to add vertical scrollbars, incorrectly inflating
     // the resulting contentHeight(). We'll need to make FrameView::layout() smarter.
@@ -190,7 +190,7 @@ void RenderIFrame::layout()
     ASSERT(needsLayout());
 
     if (flattenFrame()) {
-        RenderPart::computeLogicalWidth();
+        RenderPart::updateLogicalWidth();
         RenderPart::computeLogicalHeight();
         layoutWithFlattening(style()->width().isFixed(), style()->height().isFixed());
         // FIXME: Is early return really OK here? What about transform/overflow code below?
@@ -199,7 +199,7 @@ void RenderIFrame::layout()
         layoutSeamlessly();
         // Do not return so as to share the layer and overflow updates below.
     } else {
-        computeLogicalWidth();
+        updateLogicalWidth();
         // No kids to layout as a replaced element.
         computeLogicalHeight();
     }
index 8b93407..9ce5fa6 100644 (file)
@@ -41,7 +41,7 @@ public:
 
 private:
     virtual void computeLogicalHeight() OVERRIDE;
-    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void updateLogicalWidth() OVERRIDE;
 
     virtual LayoutUnit minPreferredLogicalWidth() const OVERRIDE;
     virtual LayoutUnit maxPreferredLogicalWidth() const OVERRIDE;
index 1953f53..c767f8f 100644 (file)
@@ -224,7 +224,7 @@ void RenderImage::imageDimensionsChanged(bool imageSizeChanged, const IntRect* r
         LayoutUnit oldheight = height();
         if (!preferredLogicalWidthsDirty())
             setPreferredLogicalWidthsDirty(true);
-        computeLogicalWidth();
+        updateLogicalWidth();
         computeLogicalHeight();
 
         if (imageSizeChanged || width() != oldwidth || height() != oldheight) {
index 497bef9..00dc45a 100644 (file)
@@ -52,9 +52,9 @@ HTMLMeterElement* RenderMeter::meterElement() const
     return toHTMLMeterElement(node()->shadowHost());
 }
 
-void RenderMeter::computeLogicalWidth()
+void RenderMeter::updateLogicalWidth()
 {
-    RenderBox::computeLogicalWidth();
+    RenderBox::updateLogicalWidth();
     setWidth(theme()->meterSizeForBounds(this, pixelSnappedIntRect(frameRect())).width());
 }
 
index b732185..7e02149 100644 (file)
@@ -39,7 +39,7 @@ public:
     virtual void updateFromElement();
 
 private:    
-    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void updateLogicalWidth() OVERRIDE;
     virtual void computeLogicalHeight() OVERRIDE;
 
     virtual const char* renderName() const { return "RenderMeter"; }
index 64271a3..e56f9f7 100644 (file)
@@ -68,9 +68,9 @@ void RenderMultiColumnBlock::computeColumnCountAndWidth()
     }
 }
 
-bool RenderMultiColumnBlock::recomputeLogicalWidth()
+bool RenderMultiColumnBlock::updateLogicalWidthAndColumnWidth()
 {
-    bool relayoutChildren = RenderBlock::recomputeLogicalWidth();
+    bool relayoutChildren = RenderBlock::updateLogicalWidthAndColumnWidth();
     LayoutUnit oldColumnWidth = m_columnWidth;
     computeColumnCountAndWidth();
     if (m_columnWidth != oldColumnWidth)
index bd9f12a..58850c3 100644 (file)
@@ -50,7 +50,7 @@ private:
     
     virtual const char* renderName() const;
 
-    virtual bool recomputeLogicalWidth() OVERRIDE;
+    virtual bool updateLogicalWidthAndColumnWidth() OVERRIDE;
     virtual void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight) OVERRIDE;
     virtual bool relayoutForPagination(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogicalHeight, LayoutStateMaintainer&) OVERRIDE;
 
index 3690119..381286e 100644 (file)
@@ -51,7 +51,7 @@ LayoutUnit RenderMultiColumnSet::pageLogicalTopForOffset(LayoutUnit offset) cons
     return portionLogicalTop + columnIndex * computedColumnHeight();
 }
 
-void RenderMultiColumnSet::computeLogicalWidth()
+void RenderMultiColumnSet::updateLogicalWidth()
 {
     // Our logical width starts off matching the column block itself.
     // This width will be fixed up after the flow thread lays out once it is determined exactly how many
index a0d1c45..7377c6d 100644 (file)
@@ -62,7 +62,7 @@ public:
     }
 
 private:
-    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void updateLogicalWidth() OVERRIDE;
     virtual void computeLogicalHeight() OVERRIDE;
 
     virtual void paintReplaced(PaintInfo&, const LayoutPoint& paintOffset) OVERRIDE;
index bcd967e..4b12d7e 100644 (file)
@@ -85,7 +85,7 @@ void RenderReplaced::layout()
     
     setHeight(minimumReplacedHeight());
 
-    computeLogicalWidth();
+    updateLogicalWidth();
     computeLogicalHeight();
 
     m_overflow.clear();
index 4f25944..d0656e4 100644 (file)
@@ -212,7 +212,7 @@ void RenderTable::removeCaption(const RenderTableCaption* oldCaption)
     m_captions.remove(index);
 }
 
-void RenderTable::computeLogicalWidth()
+void RenderTable::updateLogicalWidth()
 {
     recalcSectionsIfNeeded();
 
@@ -346,7 +346,7 @@ void RenderTable::layout()
     initMaxMarginValues();
     
     LayoutUnit oldLogicalWidth = logicalWidth();
-    computeLogicalWidth();
+    updateLogicalWidth();
 
     if (logicalWidth() != oldLogicalWidth) {
         for (unsigned i = 0; i < m_captions.size(); i++)
index 46073c5..2e9ce21 100644 (file)
@@ -261,7 +261,7 @@ private:
     
     virtual void setCellLogicalWidths();
 
-    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void updateLogicalWidth() OVERRIDE;
 
     LayoutUnit convertStyleLogicalWidthToComputedWidth(const Length& styleLogicalWidth, LayoutUnit availableWidth);
 
index 05d0ad1..e49ac10 100644 (file)
@@ -168,11 +168,11 @@ void RenderTableCell::computePreferredLogicalWidths()
     }
 }
 
-void RenderTableCell::computeLogicalWidth()
+void RenderTableCell::updateLogicalWidth()
 {
 }
 
-void RenderTableCell::updateLogicalWidth(LayoutUnit w)
+void RenderTableCell::setCellLogicalWidth(LayoutUnit w)
 {
     if (w == logicalWidth())
         return;
index 31ea56f..f0cb33e 100644 (file)
@@ -76,7 +76,7 @@ public:
 
     virtual void computePreferredLogicalWidths();
 
-    void updateLogicalWidth(LayoutUnit);
+    void setCellLogicalWidth(LayoutUnit);
 
     virtual int borderLeft() const;
     virtual int borderRight() const;
@@ -175,7 +175,7 @@ private:
 
     virtual void willBeRemovedFromTree() OVERRIDE;
 
-    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void updateLogicalWidth() OVERRIDE;
 
     virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
     virtual void paintMask(PaintInfo&, const LayoutPoint&);
index 6237908..8f08477 100644 (file)
@@ -294,7 +294,7 @@ void RenderTableSection::setCellLogicalWidths()
                     }
                     cell->repaint();
                 }
-                cell->updateLogicalWidth(w);
+                cell->setCellLogicalWidth(w);
             }
         }
     }
index c79c664..428e5a0 100644 (file)
@@ -96,7 +96,7 @@ void RenderView::computeLogicalHeight()
         setLogicalHeight(viewLogicalHeight());
 }
 
-void RenderView::computeLogicalWidth()
+void RenderView::updateLogicalWidth()
 {
     if (!shouldUsePrintingLayout() && m_frameView)
         setLogicalWidth(viewLogicalWidth());
index 4848ca9..7de54a6 100644 (file)
@@ -58,7 +58,7 @@ public:
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE;
 
     virtual void layout() OVERRIDE;
-    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void updateLogicalWidth() OVERRIDE;
     virtual void computeLogicalHeight() OVERRIDE;
     // FIXME: This override is not needed and should be removed
     // it only exists to make computePreferredLogicalWidths public.
index acc0c6d..e3c8008 100644 (file)
@@ -105,7 +105,7 @@ const AffineTransform& RenderSVGForeignObject::localToParentTransform() const
     return m_localToParentTransform;
 }
 
-void RenderSVGForeignObject::computeLogicalWidth()
+void RenderSVGForeignObject::updateLogicalWidth()
 {
     // FIXME: Investigate in size rounding issues
     // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
index 0d65d57..1314ea3 100644 (file)
@@ -59,7 +59,7 @@ public:
     virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
 
 private:
-    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void updateLogicalWidth() OVERRIDE;
     virtual void computeLogicalHeight() OVERRIDE;
 
     virtual const AffineTransform& localToParentTransform() const;
index f7115d9..4698e87 100644 (file)
@@ -229,7 +229,7 @@ void RenderSVGRoot::layout()
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout() && needsLayout);
 
     LayoutSize oldSize = size();
-    computeLogicalWidth();
+    updateLogicalWidth();
     computeLogicalHeight();
     buildLocalToBorderBoxTransform();