Index: Source/core/dom/Position.cpp |
diff --git a/Source/core/dom/Position.cpp b/Source/core/dom/Position.cpp |
index 4ceb136f5f7e67280133e30f444a3f9d6dc438c7..405a064e2df21dcd92580d7db0e433d70637ce11 100644 |
--- a/Source/core/dom/Position.cpp |
+++ b/Source/core/dom/Position.cpp |
@@ -211,13 +211,13 @@ Position Position::parentAnchoredEquivalent() const |
// FIXME: This should only be necessary for legacy positions, but is also needed for positions before and after Tables |
if (m_offset <= 0 && (m_anchorType != PositionIsAfterAnchor && m_anchorType != PositionIsAfterChildren)) { |
- if (m_anchorNode->parentNode() && (editingIgnoresContent(m_anchorNode.get()) || isTableElement(m_anchorNode.get()))) |
+ if (m_anchorNode->parentNode() && (editingIgnoresContent(m_anchorNode.get()) || isRenderedTable(m_anchorNode.get()))) |
return positionInParentBeforeNode(m_anchorNode.get()); |
return Position(m_anchorNode.get(), 0, PositionIsOffsetInAnchor); |
} |
if (!m_anchorNode->offsetInCharacters() |
&& (m_anchorType == PositionIsAfterAnchor || m_anchorType == PositionIsAfterChildren || static_cast<unsigned>(m_offset) == m_anchorNode->childNodeCount()) |
- && (editingIgnoresContent(m_anchorNode.get()) || isTableElement(m_anchorNode.get())) |
+ && (editingIgnoresContent(m_anchorNode.get()) || isRenderedTable(m_anchorNode.get())) |
&& containerNode()) { |
return positionInParentAfterNode(m_anchorNode.get()); |
} |
@@ -635,7 +635,7 @@ Position Position::upstream(EditingBoundaryCrossingRule rule) const |
return lastVisible; |
// Return position after tables and nodes which have content that can be ignored. |
- if (editingIgnoresContent(currentNode) || isTableElement(currentNode)) { |
+ if (editingIgnoresContent(currentNode) || isRenderedTable(currentNode)) { |
if (currentPos.atEndOfNode()) |
return positionAfterNode(currentNode); |
continue; |
@@ -763,7 +763,7 @@ Position Position::downstream(EditingBoundaryCrossingRule rule) const |
lastVisible = currentPos; |
// Return position before tables and nodes which have content that can be ignored. |
- if (editingIgnoresContent(currentNode) || isTableElement(currentNode)) { |
+ if (editingIgnoresContent(currentNode) || isRenderedTable(currentNode)) { |
if (currentPos.offsetInLeafNode() <= renderer->caretMinOffset()) |
return createLegacyEditingPosition(currentNode, renderer->caretMinOffset()); |
continue; |
@@ -889,7 +889,7 @@ bool Position::isCandidate() const |
if (renderer->isText()) |
return !nodeIsUserSelectNone(deprecatedNode()) && inRenderedText(); |
- if (isTableElement(deprecatedNode()) || editingIgnoresContent(deprecatedNode())) |
+ if (isRenderedTable(deprecatedNode()) || editingIgnoresContent(deprecatedNode())) |
return (atFirstEditingPositionForNode() || atLastEditingPositionForNode()) && !nodeIsUserSelectNone(deprecatedNode()->parentNode()); |
if (isHTMLHtmlElement(m_anchorNode.get())) |