[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hyatt at apple.com
hyatt at apple.com
Wed Dec 22 13:43:41 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5f4fae0635e7135b29b4da10b8264a062aa18d8c
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 24 06:45:16 2010 +0000
https://bugs.webkit.org/show_bug.cgi?id=46451
Reviewed by Sam Weinig.
Rename calcWidth to computeLogicalWidth. Rename calcHeight to computeLogicalHeight.
* rendering/RenderApplet.cpp:
(WebCore::RenderApplet::layout):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::layoutBlock):
(WebCore::RenderBlock::insertFloatingObject):
(WebCore::RenderBlock::getClearDelta):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::computeInlineDirectionPositionsForLine):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalWidth):
(WebCore::RenderBox::computeLogicalHeight):
(WebCore::RenderBox::calcPercentageHeight):
(WebCore::RenderBox::calcReplacedHeightUsing):
(WebCore::RenderBox::availableHeightUsing):
(WebCore::RenderBox::calcAbsoluteHorizontal):
* rendering/RenderBox.h:
(WebCore::RenderBox::tryLayoutDoingPositionedMovementOnly):
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::layout):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::layoutBlock):
(WebCore::RenderFlexibleBox::layoutHorizontalBox):
(WebCore::RenderFlexibleBox::layoutVerticalBox):
* rendering/RenderForeignObject.cpp:
(WebCore::RenderForeignObject::computeLogicalWidth):
(WebCore::RenderForeignObject::computeLogicalHeight):
* rendering/RenderForeignObject.h:
* rendering/RenderHTMLCanvas.cpp:
(WebCore::RenderHTMLCanvas::canvasSizeChanged):
* rendering/RenderIFrame.cpp:
(WebCore::RenderIFrame::computeLogicalHeight):
(WebCore::RenderIFrame::computeLogicalWidth):
(WebCore::RenderIFrame::layout):
* rendering/RenderIFrame.h:
* rendering/RenderImage.cpp:
(WebCore::RenderImage::imageChanged):
* rendering/RenderIndicator.cpp:
(WebCore::RenderIndicator::layout):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::computeLogicalHeight):
* rendering/RenderListBox.h:
* rendering/RenderMeter.cpp:
(WebCore::RenderMeter::computeLogicalWidth):
(WebCore::RenderMeter::computeLogicalHeight):
* rendering/RenderMeter.h:
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::layout):
* rendering/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::layout):
* rendering/RenderSlider.cpp:
(WebCore::RenderSlider::layout):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::computeLogicalWidth):
(WebCore::RenderTable::layout):
* rendering/RenderTable.h:
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::computeLogicalWidth):
* rendering/RenderTableCell.h:
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::computeLogicalHeight):
* rendering/RenderTextControl.h:
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::layout):
(WebCore::RenderTextControlSingleLine::textBlockWidth):
(WebCore::RenderTextControlSingleLine::decorationWidthRight):
(WebCore::RenderTextControlSingleLine::preferredDecorationWidthRight):
(WebCore::RenderTextControlSingleLine::adjustControlHeightBasedOnLineHeight):
* rendering/RenderView.cpp:
(WebCore::RenderView::computeLogicalHeight):
(WebCore::RenderView::computeLogicalWidth):
* rendering/RenderView.h:
* svg/SVGSVGElement.cpp:
(WebCore::SVGSVGElement::svgAttributeChanged):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68238 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a96209f..b0acb9b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,85 @@
+2010-09-23 David Hyatt <hyatt at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ https://bugs.webkit.org/show_bug.cgi?id=46451
+
+ Rename calcWidth to computeLogicalWidth. Rename calcHeight to computeLogicalHeight.
+
+ * rendering/RenderApplet.cpp:
+ (WebCore::RenderApplet::layout):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::layoutBlock):
+ (WebCore::RenderBlock::insertFloatingObject):
+ (WebCore::RenderBlock::getClearDelta):
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlock::computeInlineDirectionPositionsForLine):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeLogicalWidth):
+ (WebCore::RenderBox::computeLogicalHeight):
+ (WebCore::RenderBox::calcPercentageHeight):
+ (WebCore::RenderBox::calcReplacedHeightUsing):
+ (WebCore::RenderBox::availableHeightUsing):
+ (WebCore::RenderBox::calcAbsoluteHorizontal):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::tryLayoutDoingPositionedMovementOnly):
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::layout):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::layoutBlock):
+ (WebCore::RenderFlexibleBox::layoutHorizontalBox):
+ (WebCore::RenderFlexibleBox::layoutVerticalBox):
+ * rendering/RenderForeignObject.cpp:
+ (WebCore::RenderForeignObject::computeLogicalWidth):
+ (WebCore::RenderForeignObject::computeLogicalHeight):
+ * rendering/RenderForeignObject.h:
+ * rendering/RenderHTMLCanvas.cpp:
+ (WebCore::RenderHTMLCanvas::canvasSizeChanged):
+ * rendering/RenderIFrame.cpp:
+ (WebCore::RenderIFrame::computeLogicalHeight):
+ (WebCore::RenderIFrame::computeLogicalWidth):
+ (WebCore::RenderIFrame::layout):
+ * rendering/RenderIFrame.h:
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::imageChanged):
+ * rendering/RenderIndicator.cpp:
+ (WebCore::RenderIndicator::layout):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::computeLogicalHeight):
+ * rendering/RenderListBox.h:
+ * rendering/RenderMeter.cpp:
+ (WebCore::RenderMeter::computeLogicalWidth):
+ (WebCore::RenderMeter::computeLogicalHeight):
+ * rendering/RenderMeter.h:
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::layout):
+ * rendering/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::layout):
+ * rendering/RenderSlider.cpp:
+ (WebCore::RenderSlider::layout):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::computeLogicalWidth):
+ (WebCore::RenderTable::layout):
+ * rendering/RenderTable.h:
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::computeLogicalWidth):
+ * rendering/RenderTableCell.h:
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::computeLogicalHeight):
+ * rendering/RenderTextControl.h:
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::layout):
+ (WebCore::RenderTextControlSingleLine::textBlockWidth):
+ (WebCore::RenderTextControlSingleLine::decorationWidthRight):
+ (WebCore::RenderTextControlSingleLine::preferredDecorationWidthRight):
+ (WebCore::RenderTextControlSingleLine::adjustControlHeightBasedOnLineHeight):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::computeLogicalHeight):
+ (WebCore::RenderView::computeLogicalWidth):
+ * rendering/RenderView.h:
+ * svg/SVGSVGElement.cpp:
+ (WebCore::SVGSVGElement::svgAttributeChanged):
+
2010-09-23 Hans Wennborg <hans at chromium.org>
Reviewed by Simon Fraser.
diff --git a/WebCore/rendering/RenderApplet.cpp b/WebCore/rendering/RenderApplet.cpp
index 12eb4fb..63a18a0 100644
--- a/WebCore/rendering/RenderApplet.cpp
+++ b/WebCore/rendering/RenderApplet.cpp
@@ -79,8 +79,8 @@ void RenderApplet::layout()
{
ASSERT(needsLayout());
- calcWidth();
- calcHeight();
+ computeLogicalWidth();
+ computeLogicalHeight();
// The applet's widget gets created lazily upon first layout.
createWidgetIfNecessary();
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index d3dc001..67c4b9f 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -1123,7 +1123,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren, int pageHeight)
int oldWidth = width();
int oldColumnWidth = desiredColumnWidth();
- calcWidth();
+ computeLogicalWidth();
calcColumnWidth();
m_overflow.clear();
@@ -1141,7 +1141,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren, int pageHeight)
if (!pageHeight) {
// We need to go ahead and set our explicit page height if one exists, so that we can
// avoid doing two layout passes.
- calcHeight();
+ computeLogicalHeight();
int columnHeight = contentHeight();
if (columnHeight > 0) {
pageHeight = columnHeight;
@@ -1215,7 +1215,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren, int pageHeight)
// Calculate our new height.
int oldHeight = height();
- calcHeight();
+ computeLogicalHeight();
if (oldHeight != height()) {
if (oldHeight > height() && maxFloatBottom > height() && !childrenInline()) {
// One of our children's floats may have become an overhanging float for us. We need to look for it.
@@ -2924,7 +2924,7 @@ RenderBlock::FloatingObject* RenderBlock::insertFloatingObject(RenderBox* o)
if (!affectedByPagination)
o->layoutIfNeeded();
else {
- o->calcWidth();
+ o->computeLogicalWidth();
o->calcVerticalMargins();
}
newObj->m_width = o->width() + o->marginLeft() + o->marginRight();
@@ -3945,7 +3945,7 @@ int RenderBlock::getClearDelta(RenderBox* child, int yPos)
int oldChildY = child->y();
int oldChildWidth = child->width();
child->setY(y);
- child->calcWidth();
+ child->computeLogicalWidth();
int childWidthAtY = child->width();
child->setY(oldChildY);
child->setWidth(oldChildWidth);
diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp
index 8e7526f..7b9271b 100644
--- a/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -372,7 +372,7 @@ void RenderBlock::computeInlineDirectionPositionsForLine(RootInlineBox* lineBox,
}
} else if (!r->m_object->isRenderInline()) {
RenderBox* renderBox = toRenderBox(r->m_object);
- renderBox->calcWidth();
+ renderBox->computeLogicalWidth();
r->m_box->setLogicalWidth(renderBox->width());
totWidth += renderBox->marginLeft() + renderBox->marginRight();
}
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 67f474e..d185857 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -1347,7 +1347,7 @@ void RenderBox::repaintDuringLayoutIfMoved(const IntRect& rect)
}
}
-void RenderBox::calcWidth()
+void RenderBox::computeLogicalWidth()
{
if (isPositioned()) {
calcAbsoluteHorizontal();
@@ -1527,7 +1527,7 @@ void RenderBox::calcHorizontalMargins(const Length& marginLeft, const Length& ma
}
}
-void RenderBox::calcHeight()
+void RenderBox::computeLogicalHeight()
{
// Cell height is managed by the table and inline non-replaced elements do not support a height property.
if (isTableCell() || (isInline() && !isReplaced()))
@@ -1681,7 +1681,7 @@ int RenderBox::calcPercentageHeight(const Length& height)
// 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.
int oldHeight = cb->height();
- cb->calcHeight();
+ cb->computeLogicalHeight();
result = cb->contentHeight();
cb->setHeight(oldHeight);
} else if (cb->isRoot() && isPositioned())
@@ -1753,7 +1753,7 @@ int RenderBox::calcReplacedHeightUsing(Length height) const
ASSERT(cb->isRenderBlock());
RenderBlock* block = toRenderBlock(cb);
int oldHeight = block->height();
- block->calcHeight();
+ block->computeLogicalHeight();
int newHeight = block->calcContentBoxHeight(block->contentHeight());
block->setHeight(oldHeight);
return calcContentBoxHeight(height.calcValue(newHeight));
@@ -1803,7 +1803,7 @@ int RenderBox::availableHeightUsing(const Length& h) const
if (isRenderBlock() && isPositioned() && style()->height().isAuto() && !(style()->top().isAuto() || style()->bottom().isAuto())) {
RenderBlock* block = const_cast<RenderBlock*>(toRenderBlock(this));
int oldHeight = block->height();
- block->calcHeight();
+ block->computeLogicalHeight();
int newHeight = block->calcContentBoxHeight(block->contentHeight());
block->setHeight(oldHeight);
return calcContentBoxHeight(newHeight);
@@ -1890,7 +1890,7 @@ void RenderBox::calcAbsoluteHorizontal()
// was previously done in calculating the static distances, or ourself, which
// was also previously done for deciding what to override when you had
// over-constrained margins? Also note that the container block is used
- // in similar situations in other parts of the RenderBox class (see calcWidth()
+ // in similar situations in other parts of the RenderBox class (see computeLogicalWidth()
// and calcHorizontalMargins()). For now we are using the parent for quirks
// mode and the containing block for strict mode.
diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h
index f1a1e00..471cf8a 100644
--- a/WebCore/rendering/RenderBox.h
+++ b/WebCore/rendering/RenderBox.h
@@ -221,8 +221,8 @@ public:
virtual int containingBlockWidthForContent() const;
- virtual void calcWidth();
- virtual void calcHeight();
+ virtual void computeLogicalWidth();
+ virtual void computeLogicalHeight();
bool stretchesToViewHeight() const
{
@@ -287,11 +287,11 @@ public:
void tryLayoutDoingPositionedMovementOnly()
{
int oldWidth = width();
- calcWidth();
+ computeLogicalWidth();
// If we shrink to fit our width may have changed, so we still need full layout.
if (oldWidth != width())
return;
- calcHeight();
+ computeLogicalHeight();
setNeedsLayout(false);
}
diff --git a/WebCore/rendering/RenderEmbeddedObject.cpp b/WebCore/rendering/RenderEmbeddedObject.cpp
index 4179af3..aa301e2 100644
--- a/WebCore/rendering/RenderEmbeddedObject.cpp
+++ b/WebCore/rendering/RenderEmbeddedObject.cpp
@@ -215,8 +215,8 @@ void RenderEmbeddedObject::layout()
{
ASSERT(needsLayout());
- calcWidth();
- calcHeight();
+ computeLogicalWidth();
+ computeLogicalHeight();
RenderPart::layout();
diff --git a/WebCore/rendering/RenderFlexibleBox.cpp b/WebCore/rendering/RenderFlexibleBox.cpp
index f6ce243..867e69c 100644
--- a/WebCore/rendering/RenderFlexibleBox.cpp
+++ b/WebCore/rendering/RenderFlexibleBox.cpp
@@ -214,8 +214,8 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int /*pageHeight FIXM
int previousWidth = width();
int previousHeight = height();
- calcWidth();
- calcHeight();
+ computeLogicalWidth();
+ computeLogicalHeight();
m_overflow.clear();
@@ -243,7 +243,7 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int /*pageHeight FIXM
else
layoutVerticalBox(relayoutChildren);
- calcHeight();
+ computeLogicalHeight();
if (previousHeight != height())
relayoutChildren = true;
@@ -404,7 +404,7 @@ void RenderFlexibleBox::layoutHorizontalBox(bool relayoutChildren)
setHeight(height() + toAdd);
oldHeight = height();
- calcHeight();
+ computeLogicalHeight();
relayoutChildren = false;
if (oldHeight != height())
@@ -436,7 +436,7 @@ void RenderFlexibleBox::layoutHorizontalBox(bool relayoutChildren)
// fill the height of a containing box by default.
// Now do a layout.
int oldChildHeight = child->height();
- child->calcHeight();
+ child->computeLogicalHeight();
if (oldChildHeight != child->height())
child->setChildNeedsLayout(true, false);
@@ -761,7 +761,7 @@ void RenderFlexibleBox::layoutVerticalBox(bool relayoutChildren)
// Now we have to calc our height, so we know how much space we have remaining.
oldHeight = height();
- calcHeight();
+ computeLogicalHeight();
if (oldHeight != height())
heightSpecified = true;
diff --git a/WebCore/rendering/RenderForeignObject.cpp b/WebCore/rendering/RenderForeignObject.cpp
index bfcb940..47c0334 100644
--- a/WebCore/rendering/RenderForeignObject.cpp
+++ b/WebCore/rendering/RenderForeignObject.cpp
@@ -82,13 +82,13 @@ const AffineTransform& RenderForeignObject::localToParentTransform() const
return m_localToParentTransform;
}
-void RenderForeignObject::calcWidth()
+void RenderForeignObject::computeLogicalWidth()
{
// FIXME: Investigate in size rounding issues
setWidth(static_cast<int>(roundf(m_viewport.width())));
}
-void RenderForeignObject::calcHeight()
+void RenderForeignObject::computeLogicalHeight()
{
// FIXME: Investigate in size rounding issues
setHeight(static_cast<int>(roundf(m_viewport.height())));
diff --git a/WebCore/rendering/RenderForeignObject.h b/WebCore/rendering/RenderForeignObject.h
index d8c1f68..87423e6 100644
--- a/WebCore/rendering/RenderForeignObject.h
+++ b/WebCore/rendering/RenderForeignObject.h
@@ -57,8 +57,8 @@ public:
virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
private:
- virtual void calcWidth();
- virtual void calcHeight();
+ virtual void computeLogicalWidth();
+ virtual void computeLogicalHeight();
virtual const AffineTransform& localToParentTransform() const;
virtual AffineTransform localTransform() const { return m_localTransform; }
diff --git a/WebCore/rendering/RenderHTMLCanvas.cpp b/WebCore/rendering/RenderHTMLCanvas.cpp
index c89495b..e39a52e 100644
--- a/WebCore/rendering/RenderHTMLCanvas.cpp
+++ b/WebCore/rendering/RenderHTMLCanvas.cpp
@@ -77,8 +77,8 @@ void RenderHTMLCanvas::canvasSizeChanged()
setPrefWidthsDirty(true);
IntSize oldSize = size();
- calcWidth();
- calcHeight();
+ computeLogicalWidth();
+ computeLogicalHeight();
if (oldSize == size())
return;
diff --git a/WebCore/rendering/RenderIFrame.cpp b/WebCore/rendering/RenderIFrame.cpp
index ce01f2a..4bf458e 100644
--- a/WebCore/rendering/RenderIFrame.cpp
+++ b/WebCore/rendering/RenderIFrame.cpp
@@ -41,9 +41,9 @@ RenderIFrame::RenderIFrame(Element* element)
{
}
-void RenderIFrame::calcHeight()
+void RenderIFrame::computeLogicalHeight()
{
- RenderPart::calcHeight();
+ RenderPart::computeLogicalHeight();
if (!flattenFrame())
return;
@@ -59,9 +59,9 @@ void RenderIFrame::calcHeight()
}
}
-void RenderIFrame::calcWidth()
+void RenderIFrame::computeLogicalWidth()
{
- RenderPart::calcWidth();
+ RenderPart::computeLogicalWidth();
if (!flattenFrame())
return;
@@ -107,8 +107,8 @@ void RenderIFrame::layout()
{
ASSERT(needsLayout());
- RenderPart::calcWidth();
- RenderPart::calcHeight();
+ RenderPart::computeLogicalWidth();
+ RenderPart::computeLogicalHeight();
if (flattenFrame()) {
layoutWithFlattening(style()->width().isFixed(), style()->height().isFixed());
diff --git a/WebCore/rendering/RenderIFrame.h b/WebCore/rendering/RenderIFrame.h
index ab659a4..325e2b3 100644
--- a/WebCore/rendering/RenderIFrame.h
+++ b/WebCore/rendering/RenderIFrame.h
@@ -39,8 +39,8 @@ public:
#endif
private:
- virtual void calcHeight();
- virtual void calcWidth();
+ virtual void computeLogicalHeight();
+ virtual void computeLogicalWidth();
virtual void layout();
diff --git a/WebCore/rendering/RenderImage.cpp b/WebCore/rendering/RenderImage.cpp
index f7611b6..21c0aed 100644
--- a/WebCore/rendering/RenderImage.cpp
+++ b/WebCore/rendering/RenderImage.cpp
@@ -153,8 +153,8 @@ void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
int oldheight = height();
if (!prefWidthsDirty())
setPrefWidthsDirty(true);
- calcWidth();
- calcHeight();
+ computeLogicalWidth();
+ computeLogicalHeight();
if (imageSizeChanged || width() != oldwidth || height() != oldheight) {
shouldRepaint = false;
diff --git a/WebCore/rendering/RenderIndicator.cpp b/WebCore/rendering/RenderIndicator.cpp
index 32ef916..cd7be36 100644
--- a/WebCore/rendering/RenderIndicator.cpp
+++ b/WebCore/rendering/RenderIndicator.cpp
@@ -44,8 +44,8 @@ void RenderIndicator::layout()
ASSERT(needsLayout());
LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
- calcWidth();
- calcHeight();
+ computeLogicalWidth();
+ computeLogicalHeight();
layoutParts();
repainter.repaintAfterLayout();
setNeedsLayout(false);
diff --git a/WebCore/rendering/RenderListBox.cpp b/WebCore/rendering/RenderListBox.cpp
index aa31b6c..ebf845b 100644
--- a/WebCore/rendering/RenderListBox.cpp
+++ b/WebCore/rendering/RenderListBox.cpp
@@ -219,14 +219,14 @@ int RenderListBox::listHeight() const
return itemHeight() * numItems() - rowSpacing;
}
-void RenderListBox::calcHeight()
+void RenderListBox::computeLogicalHeight()
{
int toAdd = borderAndPaddingHeight();
int itemHeight = RenderListBox::itemHeight();
setHeight(itemHeight * size() - rowSpacing + toAdd);
- RenderBlock::calcHeight();
+ RenderBlock::computeLogicalHeight();
if (m_vBar) {
bool enabled = numVisibleItems() < numItems();
diff --git a/WebCore/rendering/RenderListBox.h b/WebCore/rendering/RenderListBox.h
index dcee739..046daee 100644
--- a/WebCore/rendering/RenderListBox.h
+++ b/WebCore/rendering/RenderListBox.h
@@ -72,7 +72,7 @@ private:
virtual void calcPrefWidths();
virtual int baselinePosition(bool firstLine, bool isRootLineBox) const;
- virtual void calcHeight();
+ virtual void computeLogicalHeight();
virtual void layout();
diff --git a/WebCore/rendering/RenderMeter.cpp b/WebCore/rendering/RenderMeter.cpp
index 1a99976..226d605 100644
--- a/WebCore/rendering/RenderMeter.cpp
+++ b/WebCore/rendering/RenderMeter.cpp
@@ -48,15 +48,15 @@ RenderMeter::~RenderMeter()
m_barPart->detach();
}
-void RenderMeter::calcWidth()
+void RenderMeter::computeLogicalWidth()
{
- RenderBox::calcWidth();
+ RenderBox::computeLogicalWidth();
setWidth(theme()->meterSizeForBounds(this, frameRect()).width());
}
-void RenderMeter::calcHeight()
+void RenderMeter::computeLogicalHeight()
{
- RenderBox::calcHeight();
+ RenderBox::computeLogicalHeight();
setHeight(theme()->meterSizeForBounds(this, frameRect()).height());
}
diff --git a/WebCore/rendering/RenderMeter.h b/WebCore/rendering/RenderMeter.h
index 0e73e40..6d4c53b 100644
--- a/WebCore/rendering/RenderMeter.h
+++ b/WebCore/rendering/RenderMeter.h
@@ -40,8 +40,8 @@ public:
private:
virtual const char* renderName() const { return "RenderMeter"; }
virtual bool isMeter() const { return true; }
- virtual void calcWidth();
- virtual void calcHeight();
+ virtual void computeLogicalWidth();
+ virtual void computeLogicalHeight();
virtual void layoutParts();
virtual bool shouldHaveParts() const;
diff --git a/WebCore/rendering/RenderReplaced.cpp b/WebCore/rendering/RenderReplaced.cpp
index 61a221a..dfb95d8 100644
--- a/WebCore/rendering/RenderReplaced.cpp
+++ b/WebCore/rendering/RenderReplaced.cpp
@@ -82,8 +82,8 @@ void RenderReplaced::layout()
setHeight(minimumReplacedHeight());
- calcWidth();
- calcHeight();
+ computeLogicalWidth();
+ computeLogicalHeight();
m_overflow.clear();
addShadowOverflow();
diff --git a/WebCore/rendering/RenderSVGRoot.cpp b/WebCore/rendering/RenderSVGRoot.cpp
index 4e23c42..ac0d70b 100644
--- a/WebCore/rendering/RenderSVGRoot.cpp
+++ b/WebCore/rendering/RenderSVGRoot.cpp
@@ -115,8 +115,8 @@ void RenderSVGRoot::layout()
LayoutRepainter repainter(*this, needsLayout && m_everHadLayout && checkForRepaintDuringLayout());
IntSize oldSize(width(), height());
- calcWidth();
- calcHeight();
+ computeLogicalWidth();
+ computeLogicalHeight();
calcViewport();
SVGSVGElement* svg = static_cast<SVGSVGElement*>(node());
diff --git a/WebCore/rendering/RenderSlider.cpp b/WebCore/rendering/RenderSlider.cpp
index e1a209a..27b6edf 100644
--- a/WebCore/rendering/RenderSlider.cpp
+++ b/WebCore/rendering/RenderSlider.cpp
@@ -274,8 +274,8 @@ void RenderSlider::layout()
IntSize oldSize = size();
setSize(baseSize);
- calcWidth();
- calcHeight();
+ computeLogicalWidth();
+ computeLogicalHeight();
if (thumb) {
if (oldSize != size())
diff --git a/WebCore/rendering/RenderTable.cpp b/WebCore/rendering/RenderTable.cpp
index bd00bce..3a8b894 100644
--- a/WebCore/rendering/RenderTable.cpp
+++ b/WebCore/rendering/RenderTable.cpp
@@ -194,7 +194,7 @@ void RenderTable::removeChild(RenderObject* oldChild)
setNeedsSectionRecalc();
}
-void RenderTable::calcWidth()
+void RenderTable::computeLogicalWidth()
{
if (isPositioned())
calcAbsoluteHorizontal();
@@ -252,7 +252,7 @@ void RenderTable::layout()
initMaxMarginValues();
int oldWidth = width();
- calcWidth();
+ computeLogicalWidth();
if (m_caption && width() != oldWidth)
m_caption->setNeedsLayout(true, false);
@@ -318,7 +318,7 @@ void RenderTable::layout()
setHeight(height() + bpTop);
if (!isPositioned())
- calcHeight();
+ computeLogicalHeight();
Length h = style()->height();
int th = 0;
@@ -371,7 +371,7 @@ void RenderTable::layout()
}
if (isPositioned())
- calcHeight();
+ computeLogicalHeight();
// table can be containing block of positioned elements.
// FIXME: Only pass true if width or height changed.
diff --git a/WebCore/rendering/RenderTable.h b/WebCore/rendering/RenderTable.h
index f131916..c9eac7a 100644
--- a/WebCore/rendering/RenderTable.h
+++ b/WebCore/rendering/RenderTable.h
@@ -170,7 +170,7 @@ private:
virtual void setCellWidths();
- virtual void calcWidth();
+ virtual void computeLogicalWidth();
virtual IntRect overflowClipRect(int tx, int ty);
diff --git a/WebCore/rendering/RenderTableCell.cpp b/WebCore/rendering/RenderTableCell.cpp
index 969325e..f2bb21e 100644
--- a/WebCore/rendering/RenderTableCell.cpp
+++ b/WebCore/rendering/RenderTableCell.cpp
@@ -144,7 +144,7 @@ void RenderTableCell::calcPrefWidths()
}
}
-void RenderTableCell::calcWidth()
+void RenderTableCell::computeLogicalWidth()
{
}
diff --git a/WebCore/rendering/RenderTableCell.h b/WebCore/rendering/RenderTableCell.h
index d0e62e7..36dd38c 100644
--- a/WebCore/rendering/RenderTableCell.h
+++ b/WebCore/rendering/RenderTableCell.h
@@ -126,7 +126,7 @@ private:
virtual bool requiresLayer() const { return isPositioned() || isTransparent() || hasOverflowClip() || hasTransform() || hasMask() || hasReflection(); }
- virtual void calcWidth();
+ virtual void computeLogicalWidth();
virtual void paintBoxDecorations(PaintInfo&, int tx, int ty);
virtual void paintMask(PaintInfo&, int tx, int ty);
diff --git a/WebCore/rendering/RenderTextControl.cpp b/WebCore/rendering/RenderTextControl.cpp
index e66e4ed..9be62d8 100644
--- a/WebCore/rendering/RenderTextControl.cpp
+++ b/WebCore/rendering/RenderTextControl.cpp
@@ -401,7 +401,7 @@ int RenderTextControl::scrollbarThickness() const
return ScrollbarTheme::nativeTheme()->scrollbarThickness();
}
-void RenderTextControl::calcHeight()
+void RenderTextControl::computeLogicalHeight()
{
setHeight(m_innerText->renderBox()->borderTop() + m_innerText->renderBox()->borderBottom() +
m_innerText->renderBox()->paddingTop() + m_innerText->renderBox()->paddingBottom() +
@@ -414,7 +414,7 @@ void RenderTextControl::calcHeight()
if (style()->overflowX() == OSCROLL || (style()->overflowX() == OAUTO && m_innerText->renderer()->style()->wordWrap() == NormalWordWrap))
setHeight(height() + scrollbarThickness());
- RenderBlock::calcHeight();
+ RenderBlock::computeLogicalHeight();
}
void RenderTextControl::hitInnerTextElement(HitTestResult& result, int xPos, int yPos, int tx, int ty)
diff --git a/WebCore/rendering/RenderTextControl.h b/WebCore/rendering/RenderTextControl.h
index de0b21b..ecf5fdd 100644
--- a/WebCore/rendering/RenderTextControl.h
+++ b/WebCore/rendering/RenderTextControl.h
@@ -85,7 +85,7 @@ protected:
virtual RenderStyle* textBaseStyle() const = 0;
virtual void updateFromElement();
- virtual void calcHeight();
+ virtual void computeLogicalHeight();
friend class TextIterator;
HTMLElement* innerTextElement() const;
diff --git a/WebCore/rendering/RenderTextControlSingleLine.cpp b/WebCore/rendering/RenderTextControlSingleLine.cpp
index 17ab65a..bf5cdd1 100644
--- a/WebCore/rendering/RenderTextControlSingleLine.cpp
+++ b/WebCore/rendering/RenderTextControlSingleLine.cpp
@@ -227,10 +227,10 @@ void RenderTextControlSingleLine::addFocusRingRects(Vector<IntRect>& rects, int
void RenderTextControlSingleLine::layout()
{
int oldHeight = height();
- calcHeight();
+ computeLogicalHeight();
int oldWidth = width();
- calcWidth();
+ computeLogicalWidth();
bool relayoutChildren = oldHeight != height() || oldWidth != width();
@@ -479,23 +479,23 @@ int RenderTextControlSingleLine::textBlockWidth() const
int width = RenderTextControl::textBlockWidth();
if (RenderBox* resultsRenderer = m_resultsButton ? m_resultsButton->renderBox() : 0) {
- resultsRenderer->calcWidth();
+ resultsRenderer->computeLogicalWidth();
width -= resultsRenderer->width() + resultsRenderer->marginLeft() + resultsRenderer->marginRight();
}
if (RenderBox* cancelRenderer = m_cancelButton ? m_cancelButton->renderBox() : 0) {
- cancelRenderer->calcWidth();
+ cancelRenderer->computeLogicalWidth();
width -= cancelRenderer->width() + cancelRenderer->marginLeft() + cancelRenderer->marginRight();
}
if (RenderBox* spinRenderer = m_innerSpinButton ? m_innerSpinButton->renderBox() : 0) {
- spinRenderer->calcWidth();
+ spinRenderer->computeLogicalWidth();
width -= spinRenderer->width() + spinRenderer->marginLeft() + spinRenderer->marginRight();
}
#if ENABLE(INPUT_SPEECH)
if (RenderBox* speechRenderer = m_speechButton ? m_speechButton->renderBox() : 0) {
- speechRenderer->calcWidth();
+ speechRenderer->computeLogicalWidth();
width -= speechRenderer->width() + speechRenderer->marginLeft() + speechRenderer->marginRight();
}
#endif
@@ -507,7 +507,7 @@ int RenderTextControlSingleLine::decorationWidthRight() const
{
int width = 0;
if (RenderBox* spinRenderer = m_outerSpinButton ? m_outerSpinButton->renderBox() : 0) {
- spinRenderer->calcWidth();
+ spinRenderer->computeLogicalWidth();
width += spinRenderer->width() + spinRenderer->marginLeft() + spinRenderer->marginRight();
}
if (width > 0)
@@ -574,7 +574,7 @@ int RenderTextControlSingleLine::preferredDecorationWidthRight() const
{
int width = 0;
if (RenderBox* spinRenderer = m_outerSpinButton ? m_outerSpinButton->renderBox() : 0) {
- spinRenderer->calcWidth();
+ spinRenderer->computeLogicalWidth();
width += spinRenderer->minPrefWidth() + spinRenderer->marginLeft() + spinRenderer->marginRight();
}
if (width > 0)
@@ -585,7 +585,7 @@ int RenderTextControlSingleLine::preferredDecorationWidthRight() const
void RenderTextControlSingleLine::adjustControlHeightBasedOnLineHeight(int lineHeight)
{
if (RenderBox* resultsRenderer = m_resultsButton ? m_resultsButton->renderBox() : 0) {
- toRenderBlock(resultsRenderer)->calcHeight();
+ toRenderBlock(resultsRenderer)->computeLogicalHeight();
setHeight(max(height(),
resultsRenderer->borderTop() + resultsRenderer->borderBottom() +
resultsRenderer->paddingTop() + resultsRenderer->paddingBottom() +
@@ -594,7 +594,7 @@ void RenderTextControlSingleLine::adjustControlHeightBasedOnLineHeight(int lineH
}
if (RenderBox* cancelRenderer = m_cancelButton ? m_cancelButton->renderBox() : 0) {
- toRenderBlock(cancelRenderer)->calcHeight();
+ toRenderBlock(cancelRenderer)->computeLogicalHeight();
setHeight(max(height(),
cancelRenderer->borderTop() + cancelRenderer->borderBottom() +
cancelRenderer->paddingTop() + cancelRenderer->paddingBottom() +
diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp
index c6b058e..b6787f6 100644
--- a/WebCore/rendering/RenderView.cpp
+++ b/WebCore/rendering/RenderView.cpp
@@ -72,13 +72,13 @@ RenderView::~RenderView()
{
}
-void RenderView::calcHeight()
+void RenderView::computeLogicalHeight()
{
if (!printing() && m_frameView)
setHeight(viewHeight());
}
-void RenderView::calcWidth()
+void RenderView::computeLogicalWidth()
{
if (!printing() && m_frameView)
setWidth(viewWidth());
diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h
index d7213c7..da6c4fa 100644
--- a/WebCore/rendering/RenderView.h
+++ b/WebCore/rendering/RenderView.h
@@ -47,8 +47,8 @@ public:
virtual bool requiresLayer() const { return true; }
virtual void layout();
- virtual void calcWidth();
- virtual void calcHeight();
+ virtual void computeLogicalWidth();
+ virtual void computeLogicalHeight();
virtual void calcPrefWidths();
// The same as the FrameView's layoutHeight/layoutWidth but with null check guards.
diff --git a/WebCore/svg/SVGSVGElement.cpp b/WebCore/svg/SVGSVGElement.cpp
index a461ec4..7de880c 100644
--- a/WebCore/svg/SVGSVGElement.cpp
+++ b/WebCore/svg/SVGSVGElement.cpp
@@ -299,7 +299,7 @@ void SVGSVGElement::svgAttributeChanged(const QualifiedName& attrName)
// FIXME: Ugly, ugly hack to around that parseMappedAttribute is not called
// when svg.width.baseValue = 100 is evaluated.
- // Thus the CSS length value for width is not updated, and width() calcWidth()
+ // Thus the CSS length value for width is not updated, and width() computeLogicalWidth()
// calculations on RenderSVGRoot will be wrong.
// https://bugs.webkit.org/show_bug.cgi?id=25387
bool updateRelativeLengths = false;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list