Diff
Modified: trunk/Source/WebCore/ChangeLog (128109 => 128110)
--- trunk/Source/WebCore/ChangeLog 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/ChangeLog 2012-09-10 21:47:50 UTC (rev 128110)
@@ -1,3 +1,85 @@
+2012-09-10 Tony Chang <[email protected]>
+
+ 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 <[email protected]>
ElementAttributeData: Use subclasses to manage varying object layouts.
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -1415,12 +1415,12 @@
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 @@
LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
- if (recomputeLogicalWidth())
+ if (updateLogicalWidthAndColumnWidth())
relayoutChildren = true;
m_overflow.clear();
@@ -2654,7 +2654,7 @@
if (isHorizontalWritingMode() == r->isHorizontalWritingMode())
r->computeLogicalHeight();
else
- r->computeLogicalWidth();
+ r->updateLogicalWidth();
oldLogicalTop = logicalTopForChild(r);
}
@@ -3760,7 +3760,7 @@
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 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();
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -1009,7 +1009,7 @@
virtual bool requiresColumns(int desiredColumnCount) const;
- virtual bool recomputeLogicalWidth();
+ virtual bool updateLogicalWidthAndColumnWidth();
virtual bool canCollapseAnonymousBlockChild() const { return true; }
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -1615,7 +1615,7 @@
}
}
-void RenderBox::computeLogicalWidth()
+void RenderBox::updateLogicalWidth()
{
LogicalExtentComputedValues computedValues;
computeLogicalWidthInRegion(computedValues);
Modified: trunk/Source/WebCore/rendering/RenderBox.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderBox.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -364,7 +364,7 @@
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 @@
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;
Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -247,7 +247,7 @@
LayoutSize previousSize = size();
- computeLogicalWidth();
+ updateLogicalWidth();
computeLogicalHeight();
m_overflow.clear();
Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -230,7 +230,7 @@
{
ASSERT(needsLayout());
- computeLogicalWidth();
+ updateLogicalWidth();
computeLogicalHeight();
RenderPart::layout();
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -254,7 +254,7 @@
LayoutSize previousSize = size();
setLogicalHeight(0);
- computeLogicalWidth();
+ updateLogicalWidth();
m_overflow.clear();
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -166,7 +166,7 @@
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 @@
dispatchRegionLayoutUpdateEvent();
}
-void RenderFlowThread::computeLogicalWidth()
+void RenderFlowThread::updateLogicalWidth()
{
LayoutUnit logicalWidth = 0;
for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -73,7 +73,7 @@
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;
Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -76,7 +76,7 @@
LayoutSize previousSize = size();
setLogicalHeight(0);
- computeLogicalWidth();
+ updateLogicalWidth();
m_overflow.clear();
Modified: trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -89,7 +89,7 @@
setPreferredLogicalWidthsDirty(true);
LayoutSize oldSize = size();
- computeLogicalWidth();
+ updateLogicalWidth();
computeLogicalHeight();
if (oldSize == size())
return;
Modified: trunk/Source/WebCore/rendering/RenderIFrame.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderIFrame.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderIFrame.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -61,13 +61,13 @@
}
}
-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 @@
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 @@
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 @@
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();
}
Modified: trunk/Source/WebCore/rendering/RenderIFrame.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderIFrame.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderIFrame.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -41,7 +41,7 @@
private:
virtual void computeLogicalHeight() OVERRIDE;
- virtual void computeLogicalWidth() OVERRIDE;
+ virtual void updateLogicalWidth() OVERRIDE;
virtual LayoutUnit minPreferredLogicalWidth() const OVERRIDE;
virtual LayoutUnit maxPreferredLogicalWidth() const OVERRIDE;
Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderImage.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -224,7 +224,7 @@
LayoutUnit oldheight = height();
if (!preferredLogicalWidthsDirty())
setPreferredLogicalWidthsDirty(true);
- computeLogicalWidth();
+ updateLogicalWidth();
computeLogicalHeight();
if (imageSizeChanged || width() != oldwidth || height() != oldheight) {
Modified: trunk/Source/WebCore/rendering/RenderMeter.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderMeter.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderMeter.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -52,9 +52,9 @@
return toHTMLMeterElement(node()->shadowHost());
}
-void RenderMeter::computeLogicalWidth()
+void RenderMeter::updateLogicalWidth()
{
- RenderBox::computeLogicalWidth();
+ RenderBox::updateLogicalWidth();
setWidth(theme()->meterSizeForBounds(this, pixelSnappedIntRect(frameRect())).width());
}
Modified: trunk/Source/WebCore/rendering/RenderMeter.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderMeter.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderMeter.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -39,7 +39,7 @@
virtual void updateFromElement();
private:
- virtual void computeLogicalWidth() OVERRIDE;
+ virtual void updateLogicalWidth() OVERRIDE;
virtual void computeLogicalHeight() OVERRIDE;
virtual const char* renderName() const { return "RenderMeter"; }
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -68,9 +68,9 @@
}
}
-bool RenderMultiColumnBlock::recomputeLogicalWidth()
+bool RenderMultiColumnBlock::updateLogicalWidthAndColumnWidth()
{
- bool relayoutChildren = RenderBlock::recomputeLogicalWidth();
+ bool relayoutChildren = RenderBlock::updateLogicalWidthAndColumnWidth();
LayoutUnit oldColumnWidth = m_columnWidth;
computeColumnCountAndWidth();
if (m_columnWidth != oldColumnWidth)
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnBlock.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderMultiColumnBlock.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnBlock.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -50,7 +50,7 @@
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;
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -51,7 +51,7 @@
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
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -62,7 +62,7 @@
}
private:
- virtual void computeLogicalWidth() OVERRIDE;
+ virtual void updateLogicalWidth() OVERRIDE;
virtual void computeLogicalHeight() OVERRIDE;
virtual void paintReplaced(PaintInfo&, const LayoutPoint& paintOffset) OVERRIDE;
Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -85,7 +85,7 @@
setHeight(minimumReplacedHeight());
- computeLogicalWidth();
+ updateLogicalWidth();
computeLogicalHeight();
m_overflow.clear();
Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderTable.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -212,7 +212,7 @@
m_captions.remove(index);
}
-void RenderTable::computeLogicalWidth()
+void RenderTable::updateLogicalWidth()
{
recalcSectionsIfNeeded();
@@ -346,7 +346,7 @@
initMaxMarginValues();
LayoutUnit oldLogicalWidth = logicalWidth();
- computeLogicalWidth();
+ updateLogicalWidth();
if (logicalWidth() != oldLogicalWidth) {
for (unsigned i = 0; i < m_captions.size(); i++)
Modified: trunk/Source/WebCore/rendering/RenderTable.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderTable.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderTable.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -261,7 +261,7 @@
virtual void setCellLogicalWidths();
- virtual void computeLogicalWidth() OVERRIDE;
+ virtual void updateLogicalWidth() OVERRIDE;
LayoutUnit convertStyleLogicalWidthToComputedWidth(const Length& styleLogicalWidth, LayoutUnit availableWidth);
Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -168,11 +168,11 @@
}
}
-void RenderTableCell::computeLogicalWidth()
+void RenderTableCell::updateLogicalWidth()
{
}
-void RenderTableCell::updateLogicalWidth(LayoutUnit w)
+void RenderTableCell::setCellLogicalWidth(LayoutUnit w)
{
if (w == logicalWidth())
return;
Modified: trunk/Source/WebCore/rendering/RenderTableCell.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderTableCell.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderTableCell.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -76,7 +76,7 @@
virtual void computePreferredLogicalWidths();
- void updateLogicalWidth(LayoutUnit);
+ void setCellLogicalWidth(LayoutUnit);
virtual int borderLeft() const;
virtual int borderRight() const;
@@ -175,7 +175,7 @@
virtual void willBeRemovedFromTree() OVERRIDE;
- virtual void computeLogicalWidth() OVERRIDE;
+ virtual void updateLogicalWidth() OVERRIDE;
virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
virtual void paintMask(PaintInfo&, const LayoutPoint&);
Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -294,7 +294,7 @@
}
cell->repaint();
}
- cell->updateLogicalWidth(w);
+ cell->setCellLogicalWidth(w);
}
}
}
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -96,7 +96,7 @@
setLogicalHeight(viewLogicalHeight());
}
-void RenderView::computeLogicalWidth()
+void RenderView::updateLogicalWidth()
{
if (!shouldUsePrintingLayout() && m_frameView)
setLogicalWidth(viewLogicalWidth());
Modified: trunk/Source/WebCore/rendering/RenderView.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/RenderView.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/RenderView.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -58,7 +58,7 @@
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.
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -105,7 +105,7 @@
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
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h (128109 => 128110)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2012-09-10 21:47:50 UTC (rev 128110)
@@ -59,7 +59,7 @@
virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
private:
- virtual void computeLogicalWidth() OVERRIDE;
+ virtual void updateLogicalWidth() OVERRIDE;
virtual void computeLogicalHeight() OVERRIDE;
virtual const AffineTransform& localToParentTransform() const;
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (128109 => 128110)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2012-09-10 21:43:52 UTC (rev 128109)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2012-09-10 21:47:50 UTC (rev 128110)
@@ -229,7 +229,7 @@
LayoutRepainter repainter(*this, checkForRepaintDuringLayout() && needsLayout);
LayoutSize oldSize = size();
- computeLogicalWidth();
+ updateLogicalWidth();
computeLogicalHeight();
buildLocalToBorderBoxTransform();
