| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006 Apple Computer, 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 setEndingSelection(VisibleSelection(positionInParentAfterNode(*nodeToIns
ert), DOWNSTREAM, endingSelection().isDirectional())); | 116 setEndingSelection(VisibleSelection(positionInParentAfterNode(*nodeToIns
ert), DOWNSTREAM, endingSelection().isDirectional())); |
| 117 } else if (pos.anchorNode()->isTextNode()) { | 117 } else if (pos.anchorNode()->isTextNode()) { |
| 118 // Split a text node | 118 // Split a text node |
| 119 Text* textNode = toText(pos.anchorNode()); | 119 Text* textNode = toText(pos.anchorNode()); |
| 120 splitTextNode(textNode, pos.computeOffsetInContainerNode()); | 120 splitTextNode(textNode, pos.computeOffsetInContainerNode()); |
| 121 insertNodeBefore(nodeToInsert, textNode); | 121 insertNodeBefore(nodeToInsert, textNode); |
| 122 Position endingPosition = firstPositionInNode(textNode); | 122 Position endingPosition = firstPositionInNode(textNode); |
| 123 | 123 |
| 124 // Handle whitespace that occurs after the split | 124 // Handle whitespace that occurs after the split |
| 125 document().updateLayoutIgnorePendingStylesheets(); | 125 document().updateLayoutIgnorePendingStylesheets(); |
| 126 if (!endingPosition.isRenderedCharacter()) { | 126 // TODO(yosin) |isRenderedCharacter()| should be removed, and we should |
| 127 // use |VisiblePosition::characterAfter()|. |
| 128 if (!isRenderedCharacter(endingPosition)) { |
| 127 Position positionBeforeTextNode(positionInParentBeforeNode(*textNode
)); | 129 Position positionBeforeTextNode(positionInParentBeforeNode(*textNode
)); |
| 128 // Clear out all whitespace and insert one non-breaking space | 130 // Clear out all whitespace and insert one non-breaking space |
| 129 deleteInsignificantTextDownstream(endingPosition); | 131 deleteInsignificantTextDownstream(endingPosition); |
| 130 ASSERT(!textNode->layoutObject() || textNode->layoutObject()->style(
)->collapseWhiteSpace()); | 132 ASSERT(!textNode->layoutObject() || textNode->layoutObject()->style(
)->collapseWhiteSpace()); |
| 131 // Deleting insignificant whitespace will remove textNode if it cont
ains nothing but insignificant whitespace. | 133 // Deleting insignificant whitespace will remove textNode if it cont
ains nothing but insignificant whitespace. |
| 132 if (textNode->inDocument()) { | 134 if (textNode->inDocument()) { |
| 133 insertTextIntoNode(textNode, 0, nonBreakingSpaceString()); | 135 insertTextIntoNode(textNode, 0, nonBreakingSpaceString()); |
| 134 } else { | 136 } else { |
| 135 RefPtrWillBeRawPtr<Text> nbspNode = document().createTextNode(no
nBreakingSpaceString()); | 137 RefPtrWillBeRawPtr<Text> nbspNode = document().createTextNode(no
nBreakingSpaceString()); |
| 136 insertNodeAt(nbspNode.get(), positionBeforeTextNode); | 138 insertNodeAt(nbspNode.get(), positionBeforeTextNode); |
| (...skipping 20 matching lines...) Expand all Loading... |
| 157 // before the line break (if the line break is at the end of a block it
isn't selectable). | 159 // before the line break (if the line break is at the end of a block it
isn't selectable). |
| 158 // So, this next call sets the endingSelection() to a caret just after t
he line break | 160 // So, this next call sets the endingSelection() to a caret just after t
he line break |
| 159 // that we inserted, or just before it if it's at the end of a block. | 161 // that we inserted, or just before it if it's at the end of a block. |
| 160 setEndingSelection(endingSelection().visibleEnd()); | 162 setEndingSelection(endingSelection().visibleEnd()); |
| 161 } | 163 } |
| 162 | 164 |
| 163 rebalanceWhitespace(); | 165 rebalanceWhitespace(); |
| 164 } | 166 } |
| 165 | 167 |
| 166 } | 168 } |
| OLD | NEW |