2009-02-10 David Hyatt <hyatt@apple.com>
Some renames on line boxes. xPos()/yPos() -> x()/y(). setXPos()/setYPos() -> setX()/setY(). m_object/object() -> m_renderer/renderer(). textObject() -> textRenderer().
Reviewed by Sam Weinig
* dom/Position.cpp:
(WebCore::Position::upstream):
(WebCore::Position::downstream):
* editing/VisiblePosition.cpp:
(WebCore::VisiblePosition::leftVisuallyDistinctCandidate):
(WebCore::VisiblePosition::rightVisuallyDistinctCandidate):
(WebCore::VisiblePosition::localCaretRect):
* editing/visible_units.cpp:
(WebCore::startPositionForLine):
(WebCore::endPositionForLine):
(WebCore::previousLinePosition):
(WebCore::nextLinePosition):
* rendering/EllipsisBox.cpp:
(WebCore::EllipsisBox::paint):
(WebCore::EllipsisBox::nodeAtPoint):
* rendering/InlineBox.cpp:
(WebCore::InlineBox::showTreeForThis):
(WebCore::InlineBox::height):
(WebCore::InlineBox::caretMinOffset):
(WebCore::InlineBox::caretMaxOffset):
(WebCore::InlineBox::deleteLine):
(WebCore::InlineBox::extractLine):
(WebCore::InlineBox::attachLine):
(WebCore::InlineBox::adjustPosition):
(WebCore::InlineBox::paint):
(WebCore::InlineBox::nodeAtPoint):
(WebCore::InlineBox::selectionState):
(WebCore::InlineBox::canAccommodateEllipsis):
* rendering/InlineBox.h:
(WebCore::InlineBox::InlineBox):
(WebCore::InlineBox::renderer):
(WebCore::InlineBox::setX):
(WebCore::InlineBox::x):
(WebCore::InlineBox::setY):
(WebCore::InlineBox::y):
(WebCore::InlineBox::topOverflow):
(WebCore::InlineBox::bottomOverflow):
(WebCore::InlineBox::leftOverflow):
(WebCore::InlineBox::rightOverflow):
(WebCore::InlineBox::visibleToHitTesting):
(WebCore::InlineBox::boxModelObject):
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::height):
(WebCore::InlineFlowBox::addToLine):
(WebCore::InlineFlowBox::removeLineBoxFromRenderObject):
(WebCore::InlineFlowBox::extractLineBoxFromRenderObject):
(WebCore::InlineFlowBox::attachLineBoxToRenderObject):
(WebCore::InlineFlowBox::rendererLineBoxes):
(WebCore::InlineFlowBox::onEndChain):
(WebCore::InlineFlowBox::determineSpacingForFlowBoxes):
(WebCore::InlineFlowBox::placeBoxesHorizontally):
(WebCore::InlineFlowBox::verticallyAlignBoxes):
(WebCore::InlineFlowBox::adjustMaxAscentAndDescent):
(WebCore::verticalPositionForBox):
(WebCore::InlineFlowBox::computeLogicalBoxHeights):
(WebCore::InlineFlowBox::placeBoxesVertically):
(WebCore::InlineFlowBox::nodeAtPoint):
(WebCore::InlineFlowBox::paint):
(WebCore::InlineFlowBox::paintFillLayer):
(WebCore::InlineFlowBox::paintBoxShadow):
(WebCore::InlineFlowBox::paintBoxDecorations):
(WebCore::InlineFlowBox::paintMask):
(WebCore::InlineFlowBox::paintTextDecorations):
* rendering/InlineFlowBox.h:
(WebCore::InlineFlowBox::borderLeft):
(WebCore::InlineFlowBox::borderRight):
(WebCore::InlineFlowBox::borderTop):
(WebCore::InlineFlowBox::borderBottom):
(WebCore::InlineFlowBox::baseline):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::height):
(WebCore::InlineTextBox::selectionState):
(WebCore::InlineTextBox::selectionRect):
(WebCore::InlineTextBox::deleteLine):
(WebCore::InlineTextBox::extractLine):
(WebCore::InlineTextBox::attachLine):
(WebCore::InlineTextBox::placeEllipsisBox):
(WebCore::InlineTextBox::isLineBreak):
(WebCore::InlineTextBox::nodeAtPoint):
(WebCore::InlineTextBox::paint):
(WebCore::InlineTextBox::selectionStartEnd):
(WebCore::InlineTextBox::paintSelection):
(WebCore::InlineTextBox::paintCompositionBackground):
(WebCore::InlineTextBox::paintCustomHighlight):
(WebCore::InlineTextBox::paintDecoration):
(WebCore::InlineTextBox::paintSpellingOrGrammarMarker):
(WebCore::InlineTextBox::paintTextMatchMarker):
(WebCore::InlineTextBox::paintDocumentMarkers):
(WebCore::InlineTextBox::paintCompositionUnderline):
(WebCore::InlineTextBox::textPos):
(WebCore::InlineTextBox::offsetForPosition):
(WebCore::InlineTextBox::positionForOffset):
* rendering/InlineTextBox.h:
(WebCore::InlineTextBox::textRenderer):
* rendering/ListMarkerBox.cpp:
(WebCore::ListMarkerBox::isText):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintEllipsisBoxes):
(WebCore::RenderBlock::lowestPosition):
(WebCore::RenderBlock::rightmostPosition):
(WebCore::RenderBlock::leftmostPosition):
(WebCore::RenderBlock::positionForBox):
(WebCore::RenderBlock::positionForCoordinates):
(WebCore::RenderBlock::getBaselineOfFirstLineBox):
(WebCore::RenderBlock::getBaselineOfLastLineBox):
(WebCore::RenderBlock::adjustForBorderFit):
(WebCore::RenderBlock::addFocusRingRects):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::paintCustomHighlight):
(WebCore::RenderBox::position):
(WebCore::RenderBox::containingBlockWidthForPositioned):
(WebCore::RenderBox::calcAbsoluteHorizontalValues):
(WebCore::RenderBox::calcAbsoluteHorizontalReplaced):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::layoutVerticalBox):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::absoluteRects):
(WebCore::RenderInline::absoluteQuads):
(WebCore::RenderInline::offsetLeft):
(WebCore::RenderInline::offsetTop):
(WebCore::RenderInline::linesBoundingBox):
(WebCore::RenderInline::relativePositionedInlineOffset):
(WebCore::RenderInline::addFocusRingRects):
(WebCore::RenderInline::paintOutline):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::localBoundingBox):
* rendering/RenderSVGTSpan.cpp:
(WebCore::RenderSVGTSpan::absoluteRects):
(WebCore::RenderSVGTSpan::absoluteQuads):
* rendering/RenderSVGText.cpp:
(WebCore::RenderSVGText::absoluteRects):
(WebCore::RenderSVGText::absoluteQuads):
(WebCore::RenderSVGText::relativeBBox):
* rendering/RenderSVGTextPath.cpp:
(WebCore::RenderSVGTextPath::absoluteRects):
(WebCore::RenderSVGTextPath::absoluteQuads):
* rendering/RenderText.cpp:
(WebCore::RenderText::absoluteRects):
(WebCore::RenderText::absoluteRectsForRange):
(WebCore::RenderText::absoluteQuads):
(WebCore::RenderText::absoluteQuadsForRange):
(WebCore::RenderText::localCaretRect):
(WebCore::RenderText::linesBoundingBox):
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::height):
(WebCore::RootInlineBox::clearTruncation):
(WebCore::RootInlineBox::placeEllipsis):
(WebCore::RootInlineBox::paintEllipsisBox):
(WebCore::RootInlineBox::addHighlightOverflow):
(WebCore::RootInlineBox::paintCustomHighlight):
(WebCore::RootInlineBox::paint):
(WebCore::RootInlineBox::nodeAtPoint):
(WebCore::RootInlineBox::childRemoved):
(WebCore::RootInlineBox::fillLineSelectionGap):
(WebCore::RootInlineBox::block):
(WebCore::isEditableLeaf):
(WebCore::RootInlineBox::closestLeafChildForXPos):
(WebCore::RootInlineBox::setVerticalOverflowPositions):
* rendering/RootInlineBox.h:
(WebCore::RootInlineBox::bottomOverflow):
(WebCore::RootInlineBox::floats):
(WebCore::RootInlineBox::setHorizontalOverflowPositions):
(WebCore::RootInlineBox::setVerticalSelectionPositions):
* rendering/SVGCharacterLayoutInfo.cpp:
(WebCore::SVGCharacterLayoutInfo::addLayoutInformation):
* rendering/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::calculateGlyphWidth):
(WebCore::SVGInlineTextBoxClosestCharacterToPositionWalker::chunkPortionCallback):
(WebCore::SVGInlineTextBoxSelectionRectWalker::chunkPortionCallback):
(WebCore::SVGInlineTextBox::svgCharacterHitsPosition):
(WebCore::SVGInlineTextBox::nodeAtPoint):
(WebCore::SVGInlineTextBox::paintCharacters):
(WebCore::SVGInlineTextBox::paintSelection):
(WebCore::SVGInlineTextBox::paintDecoration):
* rendering/SVGRenderTreeAsText.cpp:
(WebCore::writeSVGInlineTextBox):
* rendering/SVGRootInlineBox.cpp:
(WebCore::SVGRootInlineBoxPaintWalker::SVGRootInlineBoxPaintWalker):
(WebCore::SVGRootInlineBoxPaintWalker::chunkStartCallback):
(WebCore::SVGRootInlineBoxPaintWalker::chunkEndCallback):
(WebCore::SVGRootInlineBoxPaintWalker::chunkSetupFillCallback):
(WebCore::SVGRootInlineBoxPaintWalker::chunkSetupStrokeCallback):
(WebCore::SVGRootInlineBoxPaintWalker::chunkPortionCallback):
(WebCore::SVGRootInlineBox::paint):
(WebCore::cummulatedWidthOfInlineBoxCharacterRange):
(WebCore::cummulatedHeightOfInlineBoxCharacterRange):
(WebCore::svgTextRunForInlineTextBox):
(WebCore::cummulatedWidthOrHeightOfTextChunk):
(WebCore::applyTextAnchorToTextChunk):
(WebCore::SVGRootInlineBox::buildLayoutInformation):
(WebCore::SVGRootInlineBox::layoutInlineBoxes):
(WebCore::SVGRootInlineBox::buildLayoutInformationForTextBox):
(WebCore::SVGRootInlineBox::buildTextChunks):
* rendering/bidi.cpp:
(WebCore::RenderBlock::constructLine):
(WebCore::RenderBlock::computeVerticalPositionsForLine):
(WebCore::RenderBlock::layoutInlineChildren):
(WebCore::RenderBlock::checkLinesForTextOverflow):
* svg/SVGTextContentElement.cpp:
(WebCore::cumulativeCharacterRangeLength):
(WebCore::SVGInlineTextBoxQueryWalker::chunkPortionCallback):
(WebCore::findInlineTextBoxInTextChunks):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@40842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index 288adc4..6561651 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -527,7 +527,7 @@
// If we have no parent box yet, or if the run is not simply a sibling,
// then we need to construct inline boxes as necessary to properly enclose the
// run's inline box.
- if (!parentBox || parentBox->object() != r->m_object->parent())
+ if (!parentBox || parentBox->renderer() != r->m_object->parent())
// Create new inline boxes all the way back to the appropriate insertion point.
parentBox = createLineBoxes(r->m_object->parent(), firstLine);
@@ -734,7 +734,7 @@
// Align positioned boxes with the top of the line box. This is
// a reasonable approximation of an appropriate y position.
if (r->m_object->isPositioned())
- r->m_box->setYPos(height());
+ r->m_box->setY(height());
// Position is used to properly position both replaced elements and
// to update the static normal flow x/y of positioned elements.
@@ -882,9 +882,9 @@
// adjust the height accordingly.
// A line break can be either the first or the last object on a line, depending on its direction.
if (InlineBox* lastLeafChild = lastRootBox()->lastLeafChild()) {
- RenderObject* lastObject = lastLeafChild->object();
+ RenderObject* lastObject = lastLeafChild->renderer();
if (!lastObject->isBR())
- lastObject = lastRootBox()->firstLeafChild()->object();
+ lastObject = lastRootBox()->firstLeafChild()->renderer();
if (lastObject->isBR()) {
EClear clear = lastObject->style()->clear();
if (clear != CNONE)
@@ -2184,8 +2184,8 @@
// Include the scrollbar for overflow blocks, which means we want to use "contentWidth()"
bool ltr = style()->direction() == LTR;
for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
- int blockEdge = ltr ? rightOffset(curr->yPos(), curr == firstRootBox()) : leftOffset(curr->yPos(), curr == firstRootBox());
- int lineBoxEdge = ltr ? curr->xPos() + curr->width() : curr->xPos();
+ int blockEdge = ltr ? rightOffset(curr->y(), curr == firstRootBox()) : leftOffset(curr->y(), curr == firstRootBox());
+ int lineBoxEdge = ltr ? curr->x() + curr->width() : curr->x();
if ((ltr && lineBoxEdge > blockEdge) || (!ltr && lineBoxEdge < blockEdge)) {
// This line spills out of our box in the appropriate direction. Now we need to see if the line
// can be truncated. In order for truncation to be possible, the line must have sufficient space to
