| 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/editing/InsertLineBreakCommand.h" | 27 #include "core/editing/commands/InsertLineBreakCommand.h" |
| 28 | 28 |
| 29 #include "core/HTMLNames.h" | 29 #include "core/HTMLNames.h" |
| 30 #include "core/dom/Document.h" | 30 #include "core/dom/Document.h" |
| 31 #include "core/dom/Text.h" | 31 #include "core/dom/Text.h" |
| 32 #include "core/editing/EditingStyle.h" | 32 #include "core/editing/EditingStyle.h" |
| 33 #include "core/editing/EditingUtilities.h" | 33 #include "core/editing/EditingUtilities.h" |
| 34 #include "core/editing/FrameSelection.h" | 34 #include "core/editing/FrameSelection.h" |
| 35 #include "core/editing/VisiblePosition.h" | 35 #include "core/editing/VisiblePosition.h" |
| 36 #include "core/editing/VisibleUnits.h" | 36 #include "core/editing/VisibleUnits.h" |
| 37 #include "core/frame/LocalFrame.h" | 37 #include "core/frame/LocalFrame.h" |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 if (!endingPosition.isRenderedCharacter()) { |
| 127 Position positionBeforeTextNode(positionInParentBeforeNode(*textNode
)); | 127 Position positionBeforeTextNode(positionInParentBeforeNode(*textNode
)); |
| 128 // Clear out all whitespace and insert one non-breaking space | 128 // Clear out all whitespace and insert one non-breaking space |
| 129 deleteInsignificantTextDownstream(endingPosition); | 129 deleteInsignificantTextDownstream(endingPosition); |
| 130 ASSERT(!textNode->layoutObject() || textNode->layoutObject()->style(
)->collapseWhiteSpace()); | 130 ASSERT(!textNode->layoutObject() || textNode->layoutObject()->style(
)->collapseWhiteSpace()); |
| 131 // Deleting insignificant whitespace will remove textNode if it cont
ains nothing but insignificant whitespace. | 131 // Deleting insignificant whitespace will remove textNode if it cont
ains nothing but insignificant whitespace. |
| 132 if (textNode->inDocument()) | 132 if (textNode->inDocument()) { |
| 133 insertTextIntoNode(textNode, 0, nonBreakingSpaceString()); | 133 insertTextIntoNode(textNode, 0, nonBreakingSpaceString()); |
| 134 else { | 134 } else { |
| 135 RefPtrWillBeRawPtr<Text> nbspNode = document().createTextNode(no
nBreakingSpaceString()); | 135 RefPtrWillBeRawPtr<Text> nbspNode = document().createTextNode(no
nBreakingSpaceString()); |
| 136 insertNodeAt(nbspNode.get(), positionBeforeTextNode); | 136 insertNodeAt(nbspNode.get(), positionBeforeTextNode); |
| 137 endingPosition = firstPositionInNode(nbspNode.get()); | 137 endingPosition = firstPositionInNode(nbspNode.get()); |
| 138 } | 138 } |
| 139 } | 139 } |
| 140 | 140 |
| 141 setEndingSelection(VisibleSelection(endingPosition, DOWNSTREAM, endingSe
lection().isDirectional())); | 141 setEndingSelection(VisibleSelection(endingPosition, DOWNSTREAM, endingSe
lection().isDirectional())); |
| 142 } | 142 } |
| 143 | 143 |
| 144 // Handle the case where there is a typing style. | 144 // Handle the case where there is a typing style. |
| (...skipping 12 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). | 157 // 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 | 158 // 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. | 159 // that we inserted, or just before it if it's at the end of a block. |
| 160 setEndingSelection(endingSelection().visibleEnd()); | 160 setEndingSelection(endingSelection().visibleEnd()); |
| 161 } | 161 } |
| 162 | 162 |
| 163 rebalanceWhitespace(); | 163 rebalanceWhitespace(); |
| 164 } | 164 } |
| 165 | 165 |
| 166 } | 166 } |
| OLD | NEW |