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

Unified Diff: Source/core/dom/PositionIterator.cpp

Issue 24278008: [oilpan] Handlify Nodes in htmlediting (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years, 3 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/dom/PositionIterator.cpp
diff --git a/Source/core/dom/PositionIterator.cpp b/Source/core/dom/PositionIterator.cpp
index 5a878f7c1b6ee0eb39b5d36107bbd76f2a162fff..8e9238f31c23057c399485956e1233997ad3d531 100644
--- a/Source/core/dom/PositionIterator.cpp
+++ b/Source/core/dom/PositionIterator.cpp
@@ -40,12 +40,12 @@ PositionIterator::operator Position() const
if (m_nodeAfterPositionInAnchor) {
ASSERT(m_nodeAfterPositionInAnchor->parentNode() == m_anchorNode);
// FIXME: This check is inadaquete because any ancestor could be ignored by editing
- if (editingIgnoresContent(m_nodeAfterPositionInAnchor->parentNode().handle().raw()))
+ if (editingIgnoresContent(m_nodeAfterPositionInAnchor->parentNode()))
return positionBeforeNode(m_anchorNode);
return positionInParentBeforeNode(m_nodeAfterPositionInAnchor);
}
if (m_anchorNode->hasChildNodes())
- return lastPositionInOrAfterNode(m_anchorNode.raw());
+ return lastPositionInOrAfterNode(m_anchorNode);
return createLegacyEditingPosition(m_anchorNode, m_offsetInAnchor);
}
@@ -61,7 +61,7 @@ void PositionIterator::increment()
return;
}
- if (!m_anchorNode->hasChildNodes() && m_offsetInAnchor < lastOffsetForEditing(m_anchorNode.raw()))
+ if (!m_anchorNode->hasChildNodes() && m_offsetInAnchor < lastOffsetForEditing(m_anchorNode))
m_offsetInAnchor = Position::uncheckedNextOffset(m_anchorNode, m_offsetInAnchor);
else {
m_nodeAfterPositionInAnchor = m_anchorNode;
@@ -80,7 +80,7 @@ void PositionIterator::decrement()
m_anchorNode = m_nodeAfterPositionInAnchor->previousSibling();
if (m_anchorNode) {
m_nodeAfterPositionInAnchor = nullptr;
- m_offsetInAnchor = m_anchorNode->hasChildNodes() ? 0 : lastOffsetForEditing(m_anchorNode.raw());
+ m_offsetInAnchor = m_anchorNode->hasChildNodes() ? 0 : lastOffsetForEditing(m_anchorNode);
} else {
m_nodeAfterPositionInAnchor = m_nodeAfterPositionInAnchor->parentNode();
m_anchorNode = m_nodeAfterPositionInAnchor->parentNode();
@@ -91,7 +91,7 @@ void PositionIterator::decrement()
if (m_anchorNode->hasChildNodes()) {
m_anchorNode = m_anchorNode->lastChild();
- m_offsetInAnchor = m_anchorNode->hasChildNodes()? 0: lastOffsetForEditing(m_anchorNode.raw());
+ m_offsetInAnchor = m_anchorNode->hasChildNodes() ? 0: lastOffsetForEditing(m_anchorNode);
} else {
if (m_offsetInAnchor)
m_offsetInAnchor = Position::uncheckedPreviousOffset(m_anchorNode, m_offsetInAnchor);
@@ -117,7 +117,7 @@ bool PositionIterator::atEnd() const
return true;
if (m_nodeAfterPositionInAnchor)
return false;
- return !m_anchorNode->parentNode() && (m_anchorNode->hasChildNodes() || m_offsetInAnchor >= lastOffsetForEditing(m_anchorNode.raw()));
+ return !m_anchorNode->parentNode() && (m_anchorNode->hasChildNodes() || m_offsetInAnchor >= lastOffsetForEditing(m_anchorNode));
}
bool PositionIterator::atStartOfNode() const
@@ -135,7 +135,7 @@ bool PositionIterator::atEndOfNode() const
return true;
if (m_nodeAfterPositionInAnchor)
return false;
- return m_anchorNode->hasChildNodes() || m_offsetInAnchor >= lastOffsetForEditing(m_anchorNode.raw());
+ return m_anchorNode->hasChildNodes() || m_offsetInAnchor >= lastOffsetForEditing(m_anchorNode);
}
bool PositionIterator::isCandidate() const
@@ -156,7 +156,7 @@ bool PositionIterator::isCandidate() const
if (renderer->isText())
return !Position::nodeIsUserSelectNone(m_anchorNode) && Position(*this).inRenderedText();
- if (isTableElement(m_anchorNode.raw()) || editingIgnoresContent(m_anchorNode.raw()))
+ if (isTableElement(m_anchorNode) || editingIgnoresContent(m_anchorNode))
return (atStartOfNode() || atEndOfNode()) && !Position::nodeIsUserSelectNone(m_anchorNode->parentNode());
if (!m_anchorNode->hasTagName(htmlTag) && renderer->isBlockFlow()) {

Powered by Google App Engine
This is Rietveld 408576698