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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 return true; | 54 return true; |
55 } | 55 } |
56 | 56 |
57 // Whether we should insert a break element or a '\n'. | 57 // Whether we should insert a break element or a '\n'. |
58 bool InsertLineBreakCommand::shouldUseBreakElement(const Position& insertionPos) | 58 bool InsertLineBreakCommand::shouldUseBreakElement(const Position& insertionPos) |
59 { | 59 { |
60 // An editing position like [input, 0] actually refers to the position befor
e | 60 // An editing position like [input, 0] actually refers to the position befor
e |
61 // the input element, and in that case we need to check the input element's | 61 // the input element, and in that case we need to check the input element's |
62 // parent's renderer. | 62 // parent's renderer. |
63 Position p(insertionPos.parentAnchoredEquivalent()); | 63 Position p(insertionPos.parentAnchoredEquivalent()); |
64 return p.deprecatedNode()->renderer() && !p.deprecatedNode()->renderer()->st
yle()->preserveNewline(); | 64 return p.deprecatedNode()->layoutObject() && !p.deprecatedNode()->layoutObje
ct()->style()->preserveNewline(); |
65 } | 65 } |
66 | 66 |
67 void InsertLineBreakCommand::doApply() | 67 void InsertLineBreakCommand::doApply() |
68 { | 68 { |
69 deleteSelection(); | 69 deleteSelection(); |
70 VisibleSelection selection = endingSelection(); | 70 VisibleSelection selection = endingSelection(); |
71 if (!selection.isNonOrphanedCaretOrRange()) | 71 if (!selection.isNonOrphanedCaretOrRange()) |
72 return; | 72 return; |
73 | 73 |
74 VisiblePosition caret(selection.visibleStart()); | 74 VisiblePosition caret(selection.visibleStart()); |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 splitTextNode(textNode, pos.deprecatedEditingOffset()); | 120 splitTextNode(textNode, pos.deprecatedEditingOffset()); |
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 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->renderer() || textNode->renderer()->style()->colla
pseWhiteSpace()); | 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 |
(...skipping 16 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 |