| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 namespace WebCore { | 33 namespace WebCore { |
| 34 | 34 |
| 35 using namespace HTMLNames; | 35 using namespace HTMLNames; |
| 36 | 36 |
| 37 PositionIterator::operator Position() const | 37 PositionIterator::operator Position() const |
| 38 { | 38 { |
| 39 if (m_nodeAfterPositionInAnchor) { | 39 if (m_nodeAfterPositionInAnchor) { |
| 40 ASSERT(m_nodeAfterPositionInAnchor->parentNode() == m_anchorNode); | 40 ASSERT(m_nodeAfterPositionInAnchor->parentNode() == m_anchorNode); |
| 41 // FIXME: This check is inadaquete because any ancestor could be ignored
by editing | 41 // FIXME: This check is inadaquete because any ancestor could be ignored
by editing |
| 42 if (editingIgnoresContent(m_nodeAfterPositionInAnchor->parentNode())) | 42 if (editingIgnoresContent(m_nodeAfterPositionInAnchor->parentNode())) |
| 43 return positionBeforeNode(m_anchorNode); | 43 return positionBeforeNode(*m_anchorNode); |
| 44 return positionInParentBeforeNode(*m_nodeAfterPositionInAnchor); | 44 return positionInParentBeforeNode(*m_nodeAfterPositionInAnchor); |
| 45 } | 45 } |
| 46 if (m_anchorNode->hasChildren()) | 46 if (m_anchorNode->hasChildren()) |
| 47 return lastPositionInOrAfterNode(m_anchorNode); | 47 return lastPositionInOrAfterNode(m_anchorNode); |
| 48 return createLegacyEditingPosition(m_anchorNode, m_offsetInAnchor); | 48 return createLegacyEditingPosition(m_anchorNode, m_offsetInAnchor); |
| 49 } | 49 } |
| 50 | 50 |
| 51 void PositionIterator::increment() | 51 void PositionIterator::increment() |
| 52 { | 52 { |
| 53 if (!m_anchorNode) | 53 if (!m_anchorNode) |
| 54 return; | 54 return; |
| 55 | 55 |
| 56 if (m_nodeAfterPositionInAnchor) { | 56 if (m_nodeAfterPositionInAnchor) { |
| 57 m_anchorNode = m_nodeAfterPositionInAnchor; | 57 m_anchorNode = m_nodeAfterPositionInAnchor; |
| 58 m_nodeAfterPositionInAnchor = m_anchorNode->firstChild(); | 58 m_nodeAfterPositionInAnchor = m_anchorNode->firstChild(); |
| 59 m_offsetInAnchor = 0; | 59 m_offsetInAnchor = 0; |
| 60 return; | 60 return; |
| 61 } | 61 } |
| 62 | 62 |
| 63 if (!m_anchorNode->hasChildren() && m_offsetInAnchor < lastOffsetForEditing(
m_anchorNode)) | 63 if (!m_anchorNode->hasChildren() && m_offsetInAnchor < lastOffsetForEditing(
m_anchorNode)) |
| 64 m_offsetInAnchor = Position::uncheckedNextOffset(m_anchorNode, m_offsetI
nAnchor); | 64 m_offsetInAnchor = Position::uncheckedNextOffset(*m_anchorNode, m_offset
InAnchor); |
| 65 else { | 65 else { |
| 66 m_nodeAfterPositionInAnchor = m_anchorNode; | 66 m_nodeAfterPositionInAnchor = m_anchorNode; |
| 67 m_anchorNode = m_nodeAfterPositionInAnchor->parentNode(); | 67 m_anchorNode = m_nodeAfterPositionInAnchor->parentNode(); |
| 68 m_nodeAfterPositionInAnchor = m_nodeAfterPositionInAnchor->nextSibling()
; | 68 m_nodeAfterPositionInAnchor = m_nodeAfterPositionInAnchor->nextSibling()
; |
| 69 m_offsetInAnchor = 0; | 69 m_offsetInAnchor = 0; |
| 70 } | 70 } |
| 71 } | 71 } |
| 72 | 72 |
| 73 void PositionIterator::decrement() | 73 void PositionIterator::decrement() |
| 74 { | 74 { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 86 m_offsetInAnchor = 0; | 86 m_offsetInAnchor = 0; |
| 87 } | 87 } |
| 88 return; | 88 return; |
| 89 } | 89 } |
| 90 | 90 |
| 91 if (m_anchorNode->hasChildren()) { | 91 if (m_anchorNode->hasChildren()) { |
| 92 m_anchorNode = m_anchorNode->lastChild(); | 92 m_anchorNode = m_anchorNode->lastChild(); |
| 93 m_offsetInAnchor = m_anchorNode->hasChildren()? 0: lastOffsetForEditing(
m_anchorNode); | 93 m_offsetInAnchor = m_anchorNode->hasChildren()? 0: lastOffsetForEditing(
m_anchorNode); |
| 94 } else { | 94 } else { |
| 95 if (m_offsetInAnchor) | 95 if (m_offsetInAnchor) |
| 96 m_offsetInAnchor = Position::uncheckedPreviousOffset(m_anchorNode, m
_offsetInAnchor); | 96 m_offsetInAnchor = Position::uncheckedPreviousOffset(*m_anchorNode,
m_offsetInAnchor); |
| 97 else { | 97 else { |
| 98 m_nodeAfterPositionInAnchor = m_anchorNode; | 98 m_nodeAfterPositionInAnchor = m_anchorNode; |
| 99 m_anchorNode = m_anchorNode->parentNode(); | 99 m_anchorNode = m_anchorNode->parentNode(); |
| 100 } | 100 } |
| 101 } | 101 } |
| 102 } | 102 } |
| 103 | 103 |
| 104 bool PositionIterator::atStart() const | 104 bool PositionIterator::atStart() const |
| 105 { | 105 { |
| 106 if (!m_anchorNode) | 106 if (!m_anchorNode) |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer
)) | 163 if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer
)) |
| 164 return atStartOfNode() && !Position::nodeIsUserSelectNone(m_anch
orNode); | 164 return atStartOfNode() && !Position::nodeIsUserSelectNone(m_anch
orNode); |
| 165 return m_anchorNode->rendererIsEditable() && !Position::nodeIsUserSe
lectNone(m_anchorNode) && Position(*this).atEditingBoundary(); | 165 return m_anchorNode->rendererIsEditable() && !Position::nodeIsUserSe
lectNone(m_anchorNode) && Position(*this).atEditingBoundary(); |
| 166 } | 166 } |
| 167 } | 167 } |
| 168 | 168 |
| 169 return false; | 169 return false; |
| 170 } | 170 } |
| 171 | 171 |
| 172 } // namespace WebCore | 172 } // namespace WebCore |
| OLD | NEW |