Source/core/editing/VisiblePosition.cpp - Issue 977113003: Rename renderer() to layoutObject().

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

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebase to master 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

Index: Source/core/editing/VisiblePosition.cpp

diff --git a/Source/core/editing/VisiblePosition.cpp b/Source/core/editing/VisiblePosition.cpp

index 8beec8bfe60046c14c42af2021bf96d47ac35600..91e596a7756adfa04b3bb1a144a26b9c0e4fc370 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);

- LayoutObject* renderer = &box->renderer();

+ LayoutObject* renderer = &box->layoutObject();

while (true) {

if ((renderer->isReplaced() || renderer->isBR()) && offset == box->caretRightmostOffset())

@@ -145,7 +145,7 @@ Position VisiblePosition::leftVisuallyDistinctCandidate() const

box = box->prevLeafChild();

if (!box)

return primaryDirection == LTR ? previousVisuallyDistinctCandidate(m_deepPosition) : nextVisuallyDistinctCandidate(m_deepPosition);

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = box->caretRightmostOffset();

continue;

}

@@ -176,7 +176,7 @@ Position VisiblePosition::leftVisuallyDistinctCandidate() const

// Reposition at the other logical position corresponding to our edge's visual position and go for another round.

box = prevBox;

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = prevBox->caretRightmostOffset();

continue;

}

@@ -191,7 +191,7 @@ Position VisiblePosition::leftVisuallyDistinctCandidate() const

InlineBox* logicalStart = 0;

if (primaryDirection == LTR ? box->root().getLogicalStartBoxWithNode(logicalStart) : box->root().getLogicalEndBoxWithNode(logicalStart)) {

box = logicalStart;

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = primaryDirection == LTR ? box->caretMinOffset() : box->caretMaxOffset();

}

break;

@@ -210,19 +210,19 @@ Position VisiblePosition::leftVisuallyDistinctCandidate() const

break;

box = prevBox;

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = box->caretRightmostOffset();

if (box->direction() == primaryDirection)

break;

continue;

}

- while (prevBox && !prevBox->renderer().node())

+ while (prevBox && !prevBox->layoutObject().node())

prevBox = prevBox->prevLeafChild();

if (prevBox) {

box = prevBox;

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = box->caretRightmostOffset();

if (box->bidiLevel() > level) {

do {

@@ -252,7 +252,7 @@ Position VisiblePosition::leftVisuallyDistinctCandidate() const

break;

level = box->bidiLevel();

}

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = primaryDirection == LTR ? box->caretMinOffset() : box->caretMaxOffset();

}

break;

@@ -299,7 +299,7 @@ Position VisiblePosition::rightVisuallyDistinctCandidate() const

if (!box)

return primaryDirection == LTR ? nextVisuallyDistinctCandidate(m_deepPosition) : previousVisuallyDistinctCandidate(m_deepPosition);

- LayoutObject* renderer = &box->renderer();

+ LayoutObject* renderer = &box->layoutObject();

while (true) {

if ((renderer->isReplaced() || renderer->isBR()) && offset == box->caretLeftmostOffset())

@@ -309,7 +309,7 @@ Position VisiblePosition::rightVisuallyDistinctCandidate() const

box = box->nextLeafChild();

if (!box)

return primaryDirection == LTR ? nextVisuallyDistinctCandidate(m_deepPosition) : previousVisuallyDistinctCandidate(m_deepPosition);

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = box->caretLeftmostOffset();

continue;

}

@@ -340,7 +340,7 @@ Position VisiblePosition::rightVisuallyDistinctCandidate() const

// Reposition at the other logical position corresponding to our edge's visual position and go for another round.

box = nextBox;

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = nextBox->caretLeftmostOffset();

continue;

}

@@ -355,7 +355,7 @@ Position VisiblePosition::rightVisuallyDistinctCandidate() const

InlineBox* logicalEnd = 0;

if (primaryDirection == LTR ? box->root().getLogicalEndBoxWithNode(logicalEnd) : box->root().getLogicalStartBoxWithNode(logicalEnd)) {

box = logicalEnd;

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = primaryDirection == LTR ? box->caretMaxOffset() : box->caretMinOffset();

}

break;

@@ -376,19 +376,19 @@ Position VisiblePosition::rightVisuallyDistinctCandidate() const

// For example, abc 123 ^ CBA or 123 ^ CBA abc

box = nextBox;

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = box->caretLeftmostOffset();

if (box->direction() == primaryDirection)

break;

continue;

}

- while (nextBox && !nextBox->renderer().node())

+ while (nextBox && !nextBox->layoutObject().node())

nextBox = nextBox->nextLeafChild();

if (nextBox) {

box = nextBox;

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = box->caretLeftmostOffset();

if (box->bidiLevel() > level) {

@@ -419,7 +419,7 @@ Position VisiblePosition::rightVisuallyDistinctCandidate() const

break;

level = box->bidiLevel();

}

- renderer = &box->renderer();

+ renderer = &box->layoutObject();

offset = primaryDirection == LTR ? box->caretMaxOffset() : box->caretMinOffset();

}

break;

« Source/core/dom/Position.cpp ('K') | « Source/core/editing/TypingCommand.cpp ('k') | Source/core/editing/VisibleSelection.cpp » ('j') | Source/core/html/HTMLPlugInElement.cpp » ('J')