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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/editing/VisiblePosition.h ('k') | Source/core/editing/VisibleSelection.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/VisiblePosition.cpp
diff --git a/Source/core/editing/VisiblePosition.cpp b/Source/core/editing/VisiblePosition.cpp
index 6866e1d9755ef2fdf107e9dfa8044710eb59f81f..23d071df6a5d2a0b52185bc9f81ff4027c69a1f1 100644
--- a/Source/core/editing/VisiblePosition.cpp
+++ b/Source/core/editing/VisiblePosition.cpp
@@ -135,7 +135,7 @@ Position VisiblePosition::leftVisuallyDistinctCandidate() const
if (!box)
return primaryDirection == LTR ? previousVisuallyDistinctCandidate(m_deepPosition) : nextVisuallyDistinctCandidate(m_deepPosition);
- RenderObject* renderer = &box->renderer();
+ LayoutObject* renderer = &box->renderer();
while (true) {
if ((renderer->isReplaced() || renderer->isBR()) && offset == box->caretRightmostOffset())
@@ -299,7 +299,7 @@ Position VisiblePosition::rightVisuallyDistinctCandidate() const
if (!box)
return primaryDirection == LTR ? nextVisuallyDistinctCandidate(m_deepPosition) : previousVisuallyDistinctCandidate(m_deepPosition);
- RenderObject* renderer = &box->renderer();
+ LayoutObject* renderer = &box->renderer();
while (true) {
if ((renderer->isReplaced() || renderer->isBR()) && offset == box->caretLeftmostOffset())
@@ -645,7 +645,7 @@ UChar32 VisiblePosition::characterAfter() const
return textNode->data().characterStartingAt(offset);
}
-LayoutRect VisiblePosition::localCaretRect(RenderObject*& renderer) const
+LayoutRect VisiblePosition::localCaretRect(LayoutObject*& renderer) const
{
PositionWithAffinity positionWithAffinity(m_deepPosition, m_affinity);
return localCaretRectOfPosition(positionWithAffinity, renderer);
@@ -653,7 +653,7 @@ LayoutRect VisiblePosition::localCaretRect(RenderObject*& renderer) const
IntRect VisiblePosition::absoluteCaretBounds() const
{
- RenderObject* renderer;
+ LayoutObject* renderer;
LayoutRect localRect = localCaretRect(renderer);
if (localRect.isEmpty() || !renderer)
return IntRect();
@@ -663,7 +663,7 @@ IntRect VisiblePosition::absoluteCaretBounds() const
int VisiblePosition::lineDirectionPointForBlockDirectionNavigation() const
{
- RenderObject* renderer;
+ LayoutObject* renderer;
LayoutRect localRect = localCaretRect(renderer);
if (localRect.isEmpty() || !renderer)
return 0;
@@ -672,7 +672,7 @@ int VisiblePosition::lineDirectionPointForBlockDirectionNavigation() const
// without consulting transforms, so that 'up' in transformed text is 'up'
// relative to the text, not absolute 'up'.
FloatPoint caretPoint = renderer->localToAbsolute(FloatPoint(localRect.location()));
- RenderObject* containingBlock = renderer->containingBlock();
+ LayoutObject* containingBlock = renderer->containingBlock();
if (!containingBlock)
containingBlock = renderer; // Just use ourselves to determine the writing mode if we have no containing block.
return containingBlock->isHorizontalWritingMode() ? caretPoint.x() : caretPoint.y();
« no previous file with comments | « Source/core/editing/VisiblePosition.h ('k') | Source/core/editing/VisibleSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698