| Index: Source/core/dom/Position.cpp
|
| diff --git a/Source/core/dom/Position.cpp b/Source/core/dom/Position.cpp
|
| index dfa220226f7867b5e3060a0726a81279dea888f2..63fb25c95d51ace7c8bec00fa511bd12260750d0 100644
|
| --- a/Source/core/dom/Position.cpp
|
| +++ b/Source/core/dom/Position.cpp
|
| @@ -210,13 +210,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()) || isRenderedTableElement(m_anchorNode.get())))
|
| + if (m_anchorNode->parentNode() && (editingIgnoresContent(m_anchorNode.get()) || isRenderedHTMLTableElement(m_anchorNode.get())))
|
| return positionInParentBeforeNode(*m_anchorNode);
|
| return Position(m_anchorNode.get(), 0, PositionIsOffsetInAnchor);
|
| }
|
| if (!m_anchorNode->offsetInCharacters()
|
| && (m_anchorType == PositionIsAfterAnchor || m_anchorType == PositionIsAfterChildren || static_cast<unsigned>(m_offset) == m_anchorNode->countChildren())
|
| - && (editingIgnoresContent(m_anchorNode.get()) || isRenderedTableElement(m_anchorNode.get()))
|
| + && (editingIgnoresContent(m_anchorNode.get()) || isRenderedHTMLTableElement(m_anchorNode.get()))
|
| && containerNode()) {
|
| return positionInParentAfterNode(*m_anchorNode);
|
| }
|
| @@ -582,7 +582,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) || isRenderedTableElement(currentNode)) {
|
| + if (editingIgnoresContent(currentNode) || isRenderedHTMLTableElement(currentNode)) {
|
| if (currentPos.atEndOfNode())
|
| return positionAfterNode(currentNode);
|
| continue;
|
| @@ -710,7 +710,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) || isRenderedTableElement(currentNode)) {
|
| + if (editingIgnoresContent(currentNode) || isRenderedHTMLTableElement(currentNode)) {
|
| if (currentPos.offsetInLeafNode() <= renderer->caretMinOffset())
|
| return createLegacyEditingPosition(currentNode, renderer->caretMinOffset());
|
| continue;
|
| @@ -842,7 +842,7 @@ bool Position::isCandidate() const
|
| return false;
|
| }
|
|
|
| - if (isRenderedTableElement(deprecatedNode()) || editingIgnoresContent(deprecatedNode()))
|
| + if (isRenderedHTMLTableElement(deprecatedNode()) || editingIgnoresContent(deprecatedNode()))
|
| return (atFirstEditingPositionForNode() || atLastEditingPositionForNode()) && !nodeIsUserSelectNone(deprecatedNode()->parentNode());
|
|
|
| if (isHTMLHtmlElement(*m_anchorNode))
|
|
|