Diff
Modified: trunk/Source/WebCore/ChangeLog (128200 => 128201)
--- trunk/Source/WebCore/ChangeLog 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/ChangeLog 2012-09-11 17:21:57 UTC (rev 128201)
@@ -1,3 +1,89 @@
+2012-09-11 Tony Chang <[email protected]>
+
+ 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):
+
2012-09-11 Zach Kuznia <[email protected]>
Fix FilterTypeZoom to properly call canvas->restore()
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -1402,7 +1402,7 @@
LayoutUnit oldHeight = logicalHeight();
LayoutUnit oldLogicalTop = logicalTop();
setLogicalHeight(MAX_LAYOUT_UNIT / 2);
- computeLogicalHeight();
+ updateLogicalHeight();
enclosingRenderFlowThread()->setRegionRangeForBox(this, offsetFromLogicalTopOfFirstPage());
setLogicalHeight(oldHeight);
setLogicalTop(oldLogicalTop);
@@ -1433,7 +1433,7 @@
if (!pageLogicalHeight) {
// We need to go ahead and set our explicit page height if one exists, so that we can
// avoid doing two layout passes.
- computeLogicalHeight();
+ updateLogicalHeight();
LayoutUnit columnHeight = contentLogicalHeight();
if (columnHeight > ZERO_LAYOUT_UNIT) {
pageLogicalHeight = columnHeight;
@@ -1546,7 +1546,7 @@
// Calculate our new height.
LayoutUnit oldHeight = logicalHeight();
LayoutUnit oldClientAfterEdge = clientLogicalBottom();
- computeLogicalHeight();
+ updateLogicalHeight();
LayoutUnit newHeight = logicalHeight();
if (oldHeight != newHeight) {
if (oldHeight > newHeight && maxFloatLogicalBottom > newHeight && !childrenInline()) {
@@ -2652,7 +2652,7 @@
bool needsBlockDirectionLocationSetBeforeLayout = r->needsLayout() && view()->layoutState()->needsBlockDirectionLocationSetBeforeLayout();
if (needsBlockDirectionLocationSetBeforeLayout) {
if (isHorizontalWritingMode() == r->isHorizontalWritingMode())
- r->computeLogicalHeight();
+ r->updateLogicalHeight();
else
r->updateLogicalWidth();
oldLogicalTop = logicalTopForChild(r);
@@ -6057,7 +6057,7 @@
RenderBox* childBox = toRenderBox(child);
LayoutUnit oldHeight = childBox->logicalHeight();
childBox->setLogicalHeight(childBox->borderAndPaddingLogicalHeight());
- childBox->computeLogicalHeight();
+ childBox->updateLogicalHeight();
childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = childBox->logicalHeight();
childBox->setLogicalHeight(oldHeight);
} else {
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -1961,7 +1961,7 @@
return shouldFlip;
}
-void RenderBox::computeLogicalHeight()
+void RenderBox::updateLogicalHeight()
{
LogicalExtentComputedValues computedValues;
computeLogicalHeight(computedValues);
@@ -2181,7 +2181,7 @@
// Don't allow this to affect the block' height() member variable, since this
// can get called while the block is still laying out its kids.
LayoutUnit oldHeight = cb->logicalHeight();
- cb->computeLogicalHeight();
+ cb->updateLogicalHeight();
result = cb->contentLogicalHeight();
cb->setLogicalHeight(oldHeight);
}
@@ -2276,7 +2276,7 @@
ASSERT(cb->isRenderBlock());
RenderBlock* block = toRenderBlock(cb);
LayoutUnit oldHeight = block->height();
- block->computeLogicalHeight();
+ block->updateLogicalHeight();
LayoutUnit newHeight = block->adjustContentBoxLogicalHeightForBoxSizing(block->contentHeight());
block->setHeight(oldHeight);
return adjustContentBoxLogicalHeightForBoxSizing(valueForLength(logicalHeight, newHeight));
@@ -2347,7 +2347,7 @@
if (isRenderBlock() && isOutOfFlowPositioned() && style()->height().isAuto() && !(style()->top().isAuto() || style()->bottom().isAuto())) {
RenderBlock* block = const_cast<RenderBlock*>(toRenderBlock(this));
LayoutUnit oldHeight = block->logicalHeight();
- block->computeLogicalHeight();
+ block->updateLogicalHeight();
LayoutUnit newHeight = block->adjustContentBoxLogicalHeightForBoxSizing(block->contentLogicalHeight());
block->setLogicalHeight(oldHeight);
return adjustContentBoxLogicalHeightForBoxSizing(newHeight);
Modified: trunk/Source/WebCore/rendering/RenderBox.h (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderBox.h 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2012-09-11 17:21:57 UTC (rev 128201)
@@ -365,7 +365,7 @@
LayoutUnit perpendicularContainingBlockLogicalHeight() const;
virtual void updateLogicalWidth();
- virtual void computeLogicalHeight();
+ virtual void updateLogicalHeight();
void computeLogicalHeight(LogicalExtentComputedValues&) const;
RenderBoxRegionInfo* renderBoxRegionInfo(RenderRegion*, LayoutUnit offsetFromLogicalTopOfFirstPage, RenderBoxRegionInfoFlags = CacheRenderBoxRegionInfo) const;
@@ -453,7 +453,7 @@
// If we shrink to fit our width may have changed, so we still need full layout.
if (oldWidth != width())
return false;
- computeLogicalHeight();
+ updateLogicalHeight();
return true;
}
Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -248,7 +248,7 @@
LayoutSize previousSize = size();
updateLogicalWidth();
- computeLogicalHeight();
+ updateLogicalHeight();
m_overflow.clear();
@@ -269,7 +269,7 @@
layoutVerticalBox(relayoutChildren);
LayoutUnit oldClientAfterEdge = clientLogicalBottom();
- computeLogicalHeight();
+ updateLogicalHeight();
if (previousSize.height() != height())
relayoutChildren = true;
@@ -414,7 +414,7 @@
setHeight(height() + toAdd);
oldHeight = height();
- computeLogicalHeight();
+ updateLogicalHeight();
relayoutChildren = false;
if (oldHeight != height())
@@ -447,7 +447,7 @@
// fill the height of a containing box by default.
// Now do a layout.
LayoutUnit oldChildHeight = child->height();
- child->computeLogicalHeight();
+ child->updateLogicalHeight();
if (oldChildHeight != child->height())
child->setChildNeedsLayout(true, MarkOnlyThis);
@@ -735,7 +735,7 @@
// Now we have to calc our height, so we know how much space we have remaining.
oldHeight = height();
- computeLogicalHeight();
+ updateLogicalHeight();
if (oldHeight != height())
heightSpecified = true;
Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -231,7 +231,7 @@
ASSERT(needsLayout());
updateLogicalWidth();
- computeLogicalHeight();
+ updateLogicalHeight();
RenderPart::layout();
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -265,7 +265,7 @@
layoutFlexItems(*m_orderIterator, lineContexts);
LayoutUnit oldClientAfterEdge = clientLogicalBottom();
- computeLogicalHeight();
+ updateLogicalHeight();
repositionLogicalHeightDependentFlexItems(*m_orderIterator, lineContexts, oldClientAfterEdge);
if (size() != previousSize)
@@ -1058,7 +1058,7 @@
if (style()->flexDirection() == FlowColumnReverse) {
// We have to do an extra pass for column-reverse to reposition the flex items since the start depends
// on the height of the flexbox, which we only know after we've positioned all the flex items.
- computeLogicalHeight();
+ updateLogicalHeight();
layoutColumnReverse(children, childSizes, crossAxisOffset, availableFreeSpace);
}
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -222,7 +222,7 @@
}
}
-void RenderFlowThread::computeLogicalHeight()
+void RenderFlowThread::updateLogicalHeight()
{
LayoutUnit logicalHeight = 0;
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2012-09-11 17:21:57 UTC (rev 128201)
@@ -74,7 +74,7 @@
const RenderRegionList& renderRegionList() const { return m_regionList; }
virtual void updateLogicalWidth() OVERRIDE;
- virtual void computeLogicalHeight() OVERRIDE;
+ virtual void updateLogicalHeight() OVERRIDE;
void paintFlowThreadPortionInRegion(PaintInfo&, RenderRegion*, LayoutRect flowThreadPortionRect, LayoutRect flowThreadPortionOverflowRect, const LayoutPoint&) const;
bool hitTestFlowThreadPortionInRegion(RenderRegion*, LayoutRect flowThreadPortionRect, LayoutRect flowThreadPortionOverflowRect, const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset) const;
Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -83,7 +83,7 @@
layoutGridItems();
LayoutUnit oldClientAfterEdge = clientLogicalBottom();
- computeLogicalHeight();
+ updateLogicalHeight();
if (size() != previousSize)
relayoutChildren = true;
Modified: trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -90,7 +90,7 @@
LayoutSize oldSize = size();
updateLogicalWidth();
- computeLogicalHeight();
+ updateLogicalHeight();
if (oldSize == size())
return;
Modified: trunk/Source/WebCore/rendering/RenderIFrame.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderIFrame.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderIFrame.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -43,9 +43,9 @@
{
}
-void RenderIFrame::computeLogicalHeight()
+void RenderIFrame::updateLogicalHeight()
{
- RenderPart::computeLogicalHeight();
+ RenderPart::updateLogicalHeight();
if (!flattenFrame())
return;
@@ -175,7 +175,7 @@
FrameView* childFrameView = static_cast<FrameView*>(widget());
if (childFrameView) // Widget should never be null during layout(), but just in case.
setLogicalHeight(childFrameView->contentsHeight() + borderTop() + borderBottom());
- computeLogicalHeight();
+ updateLogicalHeight();
updateWidgetPosition(); // Notify the Widget of our final height.
@@ -191,7 +191,7 @@
if (flattenFrame()) {
RenderPart::updateLogicalWidth();
- RenderPart::computeLogicalHeight();
+ RenderPart::updateLogicalHeight();
layoutWithFlattening(style()->width().isFixed(), style()->height().isFixed());
// FIXME: Is early return really OK here? What about transform/overflow code below?
return;
@@ -201,7 +201,7 @@
} else {
updateLogicalWidth();
// No kids to layout as a replaced element.
- computeLogicalHeight();
+ updateLogicalHeight();
}
m_overflow.clear();
Modified: trunk/Source/WebCore/rendering/RenderIFrame.h (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderIFrame.h 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderIFrame.h 2012-09-11 17:21:57 UTC (rev 128201)
@@ -40,8 +40,8 @@
bool isSeamless() const;
private:
- virtual void computeLogicalHeight() OVERRIDE;
virtual void updateLogicalWidth() OVERRIDE;
+ virtual void updateLogicalHeight() OVERRIDE;
virtual LayoutUnit minPreferredLogicalWidth() const OVERRIDE;
virtual LayoutUnit maxPreferredLogicalWidth() const OVERRIDE;
Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderImage.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -225,7 +225,7 @@
if (!preferredLogicalWidthsDirty())
setPreferredLogicalWidthsDirty(true);
updateLogicalWidth();
- computeLogicalHeight();
+ updateLogicalHeight();
if (imageSizeChanged || width() != oldwidth || height() != oldheight) {
shouldRepaint = false;
Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -250,14 +250,14 @@
return itemHeight() * numItems() - rowSpacing;
}
-void RenderListBox::computeLogicalHeight()
+void RenderListBox::updateLogicalHeight()
{
int toAdd = borderAndPaddingHeight();
int itemHeight = RenderListBox::itemHeight();
setHeight(itemHeight * size() - rowSpacing + toAdd);
- RenderBlock::computeLogicalHeight();
+ RenderBlock::updateLogicalHeight();
if (m_vBar) {
bool enabled = numVisibleItems() < numItems();
Modified: trunk/Source/WebCore/rendering/RenderListBox.h (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderListBox.h 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2012-09-11 17:21:57 UTC (rev 128201)
@@ -77,7 +77,7 @@
virtual void computePreferredLogicalWidths();
virtual LayoutUnit baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
- virtual void computeLogicalHeight() OVERRIDE;
+ virtual void updateLogicalHeight() OVERRIDE;
virtual void layout();
Modified: trunk/Source/WebCore/rendering/RenderMeter.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderMeter.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderMeter.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -58,9 +58,9 @@
setWidth(theme()->meterSizeForBounds(this, pixelSnappedIntRect(frameRect())).width());
}
-void RenderMeter::computeLogicalHeight()
+void RenderMeter::updateLogicalHeight()
{
- RenderBox::computeLogicalHeight();
+ RenderBox::updateLogicalHeight();
setHeight(theme()->meterSizeForBounds(this, pixelSnappedIntRect(frameRect())).height());
}
Modified: trunk/Source/WebCore/rendering/RenderMeter.h (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderMeter.h 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderMeter.h 2012-09-11 17:21:57 UTC (rev 128201)
@@ -40,7 +40,7 @@
private:
virtual void updateLogicalWidth() OVERRIDE;
- virtual void computeLogicalHeight() OVERRIDE;
+ virtual void updateLogicalHeight() OVERRIDE;
virtual const char* renderName() const { return "RenderMeter"; }
virtual bool isMeter() const { return true; }
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -81,7 +81,7 @@
void RenderMultiColumnBlock::checkForPaginationLogicalHeightChange(LayoutUnit& /*pageLogicalHeight*/, bool& /*pageLogicalHeightChanged*/, bool& /*hasSpecifiedPageLogicalHeight*/)
{
// We don't actually update any of the variables. We just subclassed to adjust our column height.
- computeLogicalHeight();
+ updateLogicalHeight();
LayoutUnit newContentLogicalHeight = contentLogicalHeight();
if (newContentLogicalHeight > ZERO_LAYOUT_UNIT) {
// The regions will be invalidated when we lay them out and they change size to
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2012-09-11 17:21:57 UTC (rev 128201)
@@ -39,7 +39,7 @@
private:
virtual const char* renderName() const OVERRIDE;
- virtual void computeLogicalHeight() OVERRIDE {}; // We simply remain at our intrinsic height.
+ virtual void updateLogicalHeight() OVERRIDE { } // We simply remain at our intrinsic height.
};
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -64,7 +64,7 @@
setComputedColumnWidthAndCount(parentBlock->columnWidth(), parentBlock->columnCount()); // FIXME: This will eventually vary if we are contained inside regions.
}
-void RenderMultiColumnSet::computeLogicalHeight()
+void RenderMultiColumnSet::updateLogicalHeight()
{
// Make sure our column height is up to date.
RenderMultiColumnBlock* parentBlock = toRenderMultiColumnBlock(parent());
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.h (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.h 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.h 2012-09-11 17:21:57 UTC (rev 128201)
@@ -63,7 +63,7 @@
private:
virtual void updateLogicalWidth() OVERRIDE;
- virtual void computeLogicalHeight() OVERRIDE;
+ virtual void updateLogicalHeight() OVERRIDE;
virtual void paintReplaced(PaintInfo&, const LayoutPoint& paintOffset) OVERRIDE;
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE;
Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -86,7 +86,7 @@
setHeight(minimumReplacedHeight());
updateLogicalWidth();
- computeLogicalHeight();
+ updateLogicalHeight();
m_overflow.clear();
addVisualEffectOverflow();
Modified: trunk/Source/WebCore/rendering/RenderSearchField.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderSearchField.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderSearchField.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -151,13 +151,13 @@
{
HTMLElement* resultsButton = resultsButtonElement();
if (RenderBox* resultsRenderer = resultsButton ? resultsButton->renderBox() : 0) {
- resultsRenderer->computeLogicalHeight();
+ resultsRenderer->updateLogicalHeight();
nonContentHeight = max(nonContentHeight, resultsRenderer->borderAndPaddingHeight() + resultsRenderer->marginHeight());
lineHeight = max(lineHeight, resultsRenderer->height());
}
HTMLElement* cancelButton = cancelButtonElement();
if (RenderBox* cancelRenderer = cancelButton ? cancelButton->renderBox() : 0) {
- cancelRenderer->computeLogicalHeight();
+ cancelRenderer->updateLogicalHeight();
nonContentHeight = max(nonContentHeight, cancelRenderer->borderAndPaddingHeight() + cancelRenderer->marginHeight());
lineHeight = max(lineHeight, cancelRenderer->height());
}
Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderTable.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -407,7 +407,7 @@
setLogicalHeight(logicalHeight() + borderAndPaddingBefore);
if (!isOutOfFlowPositioned())
- computeLogicalHeight();
+ updateLogicalHeight();
Length logicalHeightLength = style()->logicalHeight();
LayoutUnit computedLogicalHeight = 0;
@@ -459,7 +459,7 @@
}
if (isOutOfFlowPositioned())
- computeLogicalHeight();
+ updateLogicalHeight();
// table can be containing block of positioned elements.
// FIXME: Only pass true if width or height changed.
Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -144,7 +144,7 @@
return ScrollbarTheme::theme()->scrollbarThickness();
}
-void RenderTextControl::computeLogicalHeight()
+void RenderTextControl::updateLogicalHeight()
{
HTMLElement* innerText = innerTextElement();
ASSERT(innerText);
@@ -157,7 +157,7 @@
setHeight(height() + scrollbarThickness());
}
- RenderBlock::computeLogicalHeight();
+ RenderBlock::updateLogicalHeight();
}
void RenderTextControl::hitInnerTextElement(HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset)
Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderTextControl.h 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h 2012-09-11 17:21:57 UTC (rev 128201)
@@ -62,7 +62,7 @@
virtual RenderStyle* textBaseStyle() const = 0;
virtual void updateFromElement();
- virtual void computeLogicalHeight() OVERRIDE;
+ virtual void updateLogicalHeight() OVERRIDE;
virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren);
private:
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -90,7 +90,7 @@
return layer()->hitTest(request, result);
}
-void RenderView::computeLogicalHeight()
+void RenderView::updateLogicalHeight()
{
if (!shouldUsePrintingLayout() && m_frameView)
setLogicalHeight(viewLogicalHeight());
Modified: trunk/Source/WebCore/rendering/RenderView.h (128200 => 128201)
--- trunk/Source/WebCore/rendering/RenderView.h 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/RenderView.h 2012-09-11 17:21:57 UTC (rev 128201)
@@ -59,7 +59,7 @@
virtual void layout() OVERRIDE;
virtual void updateLogicalWidth() OVERRIDE;
- virtual void computeLogicalHeight() OVERRIDE;
+ virtual void updateLogicalHeight() OVERRIDE;
// FIXME: This override is not needed and should be removed
// it only exists to make computePreferredLogicalWidths public.
virtual void computePreferredLogicalWidths() OVERRIDE;
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -112,7 +112,7 @@
setWidth(static_cast<int>(roundf(m_viewport.width())));
}
-void RenderSVGForeignObject::computeLogicalHeight()
+void RenderSVGForeignObject::updateLogicalHeight()
{
// 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 (128200 => 128201)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2012-09-11 17:21:57 UTC (rev 128201)
@@ -60,7 +60,7 @@
private:
virtual void updateLogicalWidth() OVERRIDE;
- virtual void computeLogicalHeight() OVERRIDE;
+ virtual void updateLogicalHeight() OVERRIDE;
virtual const AffineTransform& localToParentTransform() const;
virtual AffineTransform localTransform() const { return m_localTransform; }
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (128200 => 128201)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2012-09-11 17:21:03 UTC (rev 128200)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2012-09-11 17:21:57 UTC (rev 128201)
@@ -230,7 +230,7 @@
LayoutSize oldSize = size();
updateLogicalWidth();
- computeLogicalHeight();
+ updateLogicalHeight();
buildLocalToBorderBoxTransform();
SVGSVGElement* svg = static_cast<SVGSVGElement*>(node());
