Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(692)

Unified Diff: Source/core/editing/RenderedPosition.cpp

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/editing/RenderedPosition.cpp
diff --git a/Source/core/editing/RenderedPosition.cpp b/Source/core/editing/RenderedPosition.cpp
index 7fce203bae8d34275bead7b0679540287ab26e2e..84e8dafc58fe9aeb3d86d99e0b940e55073aea69 100644
--- a/Source/core/editing/RenderedPosition.cpp
+++ b/Source/core/editing/RenderedPosition.cpp
@@ -45,7 +45,7 @@ static inline LayoutObject* rendererFromPosition(const Position& position)
switch (position.anchorType()) {
case Position::PositionIsOffsetInAnchor:
rendererNode = position.computeNodeAfterPosition();
- if (!rendererNode || !rendererNode->renderer())
+ if (!rendererNode || !rendererNode->layoutObject())
rendererNode = position.anchorNode()->lastChild();
break;
@@ -60,9 +60,9 @@ static inline LayoutObject* rendererFromPosition(const Position& position)
rendererNode = position.anchorNode()->lastChild();
break;
}
- if (!rendererNode || !rendererNode->renderer())
+ if (!rendererNode || !rendererNode->layoutObject())
rendererNode = position.anchorNode();
- return rendererNode->renderer();
+ return rendererNode->layoutObject();
}
RenderedPosition::RenderedPosition(const VisiblePosition& position)
@@ -76,7 +76,7 @@ RenderedPosition::RenderedPosition(const VisiblePosition& position)
return;
position.getInlineBoxAndOffset(m_inlineBox, m_offset);
if (m_inlineBox)
- m_renderer = &m_inlineBox->renderer();
+ m_renderer = &m_inlineBox->layoutObject();
else
m_renderer = rendererFromPosition(position.deepEquivalent());
}
@@ -92,7 +92,7 @@ RenderedPosition::RenderedPosition(const Position& position, EAffinity affinity)
return;
position.getInlineBoxAndOffset(affinity, m_inlineBox, m_offset);
if (m_inlineBox)
- m_renderer = &m_inlineBox->renderer();
+ m_renderer = &m_inlineBox->layoutObject();
else
m_renderer = rendererFromPosition(position);
}
@@ -139,7 +139,7 @@ RenderedPosition RenderedPosition::leftBoundaryOfBidiRun(unsigned char bidiLevel
do {
InlineBox* prev = box->prevLeafChildIgnoringLineBreak();
if (!prev || prev->bidiLevel() < bidiLevelOfRun)
- return RenderedPosition(&box->renderer(), box, box->caretLeftmostOffset());
+ return RenderedPosition(&box->layoutObject(), box, box->caretLeftmostOffset());
box = prev;
} while (box);
@@ -156,7 +156,7 @@ RenderedPosition RenderedPosition::rightBoundaryOfBidiRun(unsigned char bidiLeve
do {
InlineBox* next = box->nextLeafChildIgnoringLineBreak();
if (!next || next->bidiLevel() < bidiLevelOfRun)
- return RenderedPosition(&box->renderer(), box, box->caretRightmostOffset());
+ return RenderedPosition(&box->layoutObject(), box, box->caretRightmostOffset());
box = next;
} while (box);
@@ -211,7 +211,7 @@ Position RenderedPosition::positionAtLeftBoundaryOfBiDiRun() const
if (atLeftmostOffsetInBox())
return createLegacyEditingPosition(m_renderer->node(), m_offset);
- return createLegacyEditingPosition(nextLeafChild()->renderer().node(), nextLeafChild()->caretLeftmostOffset());
+ return createLegacyEditingPosition(nextLeafChild()->layoutObject().node(), nextLeafChild()->caretLeftmostOffset());
}
Position RenderedPosition::positionAtRightBoundaryOfBiDiRun() const
@@ -221,7 +221,7 @@ Position RenderedPosition::positionAtRightBoundaryOfBiDiRun() const
if (atRightmostOffsetInBox())
return createLegacyEditingPosition(m_renderer->node(), m_offset);
- return createLegacyEditingPosition(prevLeafChild()->renderer().node(), prevLeafChild()->caretRightmostOffset());
+ return createLegacyEditingPosition(prevLeafChild()->layoutObject().node(), prevLeafChild()->caretRightmostOffset());
}
IntRect RenderedPosition::absoluteRect(LayoutUnit* extraWidthToEndOfLine) const
« no previous file with comments | « Source/core/editing/InsertParagraphSeparatorCommand.cpp ('k') | Source/core/editing/ReplaceSelectionCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698