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

Unified Diff: Source/core/editing/iterators/TextIterator.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/iterators/SimplifiedBackwardsTextIterator.cpp ('k') | Source/core/editing/markup.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/iterators/TextIterator.cpp
diff --git a/Source/core/editing/iterators/TextIterator.cpp b/Source/core/editing/iterators/TextIterator.cpp
index 52a53a8b742e656290136f14a53a29e441aae164..01a59b08f02d2a54f5eea43facfaaf8d1dcc23e5 100644
--- a/Source/core/editing/iterators/TextIterator.cpp
+++ b/Source/core/editing/iterators/TextIterator.cpp
@@ -204,7 +204,7 @@ bool TextIterator::isInsideReplacedElement() const
if (atEnd() || length() != 1 || !m_node)
return false;
- RenderObject* renderer = m_node->renderer();
+ LayoutObject* renderer = m_node->renderer();
return renderer && renderer->isReplaced();
}
@@ -260,7 +260,7 @@ void TextIterator::advance()
return;
}
- RenderObject* renderer = m_node->renderer();
+ LayoutObject* renderer = m_node->renderer();
if (!renderer) {
if (m_node->isShadowRoot()) {
// A shadow root doesn't have a renderer, but we want to visit children anyway.
@@ -624,11 +624,11 @@ void TextIterator::handleTextNodeFirstLetter(RenderTextFragment* renderer)
if (!firstLetterElement)
return;
- RenderObject* pseudoRenderer = firstLetterElement->renderer();
+ LayoutObject* pseudoRenderer = firstLetterElement->renderer();
if (pseudoRenderer->style()->visibility() != VISIBLE && !m_ignoresStyleVisibility)
return;
- RenderObject* firstLetter = pseudoRenderer->slowFirstChild();
+ LayoutObject* firstLetter = pseudoRenderer->slowFirstChild();
ASSERT(firstLetter);
m_remainingTextBox = m_textBox;
@@ -656,7 +656,7 @@ bool TextIterator::handleReplacedElement()
if (m_fullyClippedStack.top())
return false;
- RenderObject* renderer = m_node->renderer();
+ LayoutObject* renderer = m_node->renderer();
if (renderer->style()->visibility() != VISIBLE && !m_ignoresStyleVisibility)
return false;
@@ -719,13 +719,13 @@ bool TextIterator::hasVisibleTextNode(RenderText* renderer)
return false;
ASSERT(fragment->firstLetterPseudoElement());
- RenderObject* pseudoElementRenderer = fragment->firstLetterPseudoElement()->renderer();
+ LayoutObject* pseudoElementRenderer = fragment->firstLetterPseudoElement()->renderer();
return pseudoElementRenderer && pseudoElementRenderer->style()->visibility() == VISIBLE;
}
bool TextIterator::shouldEmitTabBeforeNode(Node* node)
{
- RenderObject* r = node->renderer();
+ LayoutObject* r = node->renderer();
// Table cells are delimited by tabs.
if (!r || !isTableCell(node))
@@ -739,7 +739,7 @@ bool TextIterator::shouldEmitTabBeforeNode(Node* node)
bool TextIterator::shouldEmitNewlineForNode(Node* node, bool emitsOriginalText)
{
- RenderObject* renderer = node->renderer();
+ LayoutObject* renderer = node->renderer();
if (renderer ? !renderer->isBR() : !isHTMLBRElement(node))
return false;
@@ -750,7 +750,7 @@ static bool shouldEmitNewlinesBeforeAndAfterNode(Node& node)
{
// Block flow (versus inline flow) is represented by having
// a newline both before and after the element.
- RenderObject* r = node.renderer();
+ LayoutObject* r = node.renderer();
if (!r) {
return (node.hasTagName(blockquoteTag)
|| node.hasTagName(ddTag)
@@ -822,7 +822,7 @@ static bool shouldEmitExtraNewlineForNode(Node* node)
// newline for a more realistic result. We end up getting the right
// result even without margin collapsing. For example: <div><p>text</p></div>
// will work right even if both the <div> and the <p> have bottom margins.
- RenderObject* r = node->renderer();
+ LayoutObject* r = node->renderer();
if (!r || !r->isBox())
return false;
« no previous file with comments | « Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp ('k') | Source/core/editing/markup.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698